Browse Source

fix setting up reverse thrust for uuv with joysticks

QGC4.4
ryanmeagher 4 years ago committed by Don Gagne
parent
commit
000f93afe9
  1. 4
      src/Joystick/Joystick.cc
  2. 1
      src/Joystick/Joystick.h
  3. 2
      src/VehicleSetup/JoystickConfigAdvanced.qml

4
src/Joystick/Joystick.cc

@ -27,6 +27,7 @@ const char* Joystick::_calibratedSettingsKey = "Calibrated4"; // Increm @@ -27,6 +27,7 @@ const char* Joystick::_calibratedSettingsKey = "Calibrated4"; // Increm
const char* Joystick::_buttonActionNameKey = "ButtonActionName%1";
const char* Joystick::_buttonActionRepeatKey = "ButtonActionRepeat%1";
const char* Joystick::_throttleModeSettingsKey = "ThrottleMode";
const char* Joystick::_negativeThrustSettingsKey = "NegativeThrust";
const char* Joystick::_exponentialSettingsKey = "Exponential";
const char* Joystick::_accumulatorSettingsKey = "Accumulator";
const char* Joystick::_deadbandSettingsKey = "Deadband";
@ -238,6 +239,8 @@ void Joystick::_loadSettings() @@ -238,6 +239,8 @@ void Joystick::_loadSettings()
_axisFrequencyHz = settings.value(_axisFrequencySettingsKey, _defaultAxisFrequencyHz).toFloat();
_buttonFrequencyHz = settings.value(_buttonFrequencySettingsKey, _defaultButtonFrequencyHz).toFloat();
_circleCorrection = settings.value(_circleCorrectionSettingsKey, false).toBool();
_negativeThrust = settings.value(_negativeThrustSettingsKey, false).toBool();
_throttleMode = static_cast<ThrottleMode_t>(settings.value(_throttleModeSettingsKey, ThrottleModeDownZero).toInt(&convertOk));
badSettings |= !convertOk;
@ -341,6 +344,7 @@ void Joystick::_saveSettings() @@ -341,6 +344,7 @@ void Joystick::_saveSettings()
settings.setValue(_axisFrequencySettingsKey, _axisFrequencyHz);
settings.setValue(_buttonFrequencySettingsKey, _buttonFrequencyHz);
settings.setValue(_throttleModeSettingsKey, _throttleMode);
settings.setValue(_negativeThrustSettingsKey, _negativeThrust);
settings.setValue(_circleCorrectionSettingsKey, _circleCorrection);
qCDebug(JoystickLog) << "_saveSettings calibrated:throttlemode:deadband:txmode" << _calibrated << _throttleMode << _deadband << _circleCorrection << _transmitterMode;

1
src/Joystick/Joystick.h

@ -311,6 +311,7 @@ private: @@ -311,6 +311,7 @@ private:
static const char* _buttonActionNameKey;
static const char* _buttonActionRepeatKey;
static const char* _throttleModeSettingsKey;
static const char* _negativeThrustSettingsKey;
static const char* _exponentialSettingsKey;
static const char* _accumulatorSettingsKey;
static const char* _deadbandSettingsKey;

2
src/VehicleSetup/JoystickConfigAdvanced.qml

@ -64,7 +64,7 @@ Item { @@ -64,7 +64,7 @@ Item {
}
QGCCheckBox {
visible: globals.activeVehicle.supportsNegativeThrust
enabled: _activeJoystick.negativeThrust = globals.activeVehicle.supportsNegativeThrust
enabled: globals.activeVehicle.supportsNegativeThrust
checked: _activeJoystick ? _activeJoystick.negativeThrust : false
onClicked: _activeJoystick.negativeThrust = checked
}

Loading…
Cancel
Save