Unverified Commit 730ab8fb authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #7163 from DonLakeFlyer/JoystickThrottleMode

Joystick: Default to ThrottleModeDownZero
parents b804411f 20dd19c7
...@@ -71,7 +71,7 @@ Joystick::Joystick(const QString& name, int axisCount, int buttonCount, int hatC ...@@ -71,7 +71,7 @@ Joystick::Joystick(const QString& name, int axisCount, int buttonCount, int hatC
, _rgCalibration(nullptr) , _rgCalibration(nullptr)
, _rgButtonValues(nullptr) , _rgButtonValues(nullptr)
, _lastButtonBits(0) , _lastButtonBits(0)
, _throttleMode(ThrottleModeCenterZero) , _throttleMode(ThrottleModeDownZero)
, _negativeThrust(false) , _negativeThrust(false)
, _exponential(0) , _exponential(0)
, _accumulator(false) , _accumulator(false)
...@@ -140,7 +140,7 @@ void Joystick::_setDefaultCalibration(void) { ...@@ -140,7 +140,7 @@ void Joystick::_setDefaultCalibration(void) {
_deadband = false; _deadband = false;
_circleCorrection = false; _circleCorrection = false;
_frequency = 25.0f; _frequency = 25.0f;
_throttleMode = ThrottleModeCenterZero; _throttleMode = ThrottleModeDownZero;
_calibrated = true; _calibrated = true;
_saveSettings(); _saveSettings();
...@@ -207,7 +207,7 @@ void Joystick::_loadSettings(void) ...@@ -207,7 +207,7 @@ void Joystick::_loadSettings(void)
_circleCorrection = settings.value(_circleCorrectionSettingsKey, false).toBool(); _circleCorrection = settings.value(_circleCorrectionSettingsKey, false).toBool();
_frequency = settings.value(_frequencySettingsKey, 25.0f).toFloat(); _frequency = settings.value(_frequencySettingsKey, 25.0f).toFloat();
_throttleMode = (ThrottleMode_t)settings.value(_throttleModeSettingsKey, ThrottleModeCenterZero).toInt(&convertOk); _throttleMode = (ThrottleMode_t)settings.value(_throttleModeSettingsKey, ThrottleModeDownZero).toInt(&convertOk);
badSettings |= !convertOk; badSettings |= !convertOk;
qCDebug(JoystickLog) << "_loadSettings calibrated:txmode:throttlemode:exponential:deadband:badsettings" << _calibrated << _transmitterMode << _throttleMode << _exponential << _deadband << badSettings; qCDebug(JoystickLog) << "_loadSettings calibrated:txmode:throttlemode:exponential:deadband:badsettings" << _calibrated << _transmitterMode << _throttleMode << _exponential << _deadband << badSettings;
......
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