zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Done

QGC4.4
Gus Grubba 6 years ago
parent
88b201efec
commit
066ffe31b8
6 changed files with 150 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 115
      src/Joystick/Joystick.cc
  2. 23
      src/Joystick/Joystick.h
  3. 6
      src/QmlControls/QmlObjectListModel.cc
  4. 3
      src/VehicleSetup/JoystickConfig.qml
  5. 28
      src/VehicleSetup/JoystickConfigAdvanced.qml
  6. 30
      src/VehicleSetup/JoystickConfigButtons.qml

115
src/Joystick/Joystick.cc
Unescape View File

@ -23,16 +23,16 @@ QGC_LOGGING_CATEGORY(JoystickLog, "JoystickLog")
QGC_LOGGING_CATEGORY(JoystickValuesLog, "JoystickValuesLog") QGC_LOGGING_CATEGORY(JoystickValuesLog, "JoystickValuesLog")
const char* Joystick::_settingsGroup = "Joysticks"; const char* Joystick::_settingsGroup = "Joysticks";
const char* Joystick::_calibratedSettingsKey = "Calibrated3"; // Increment number to force recalibration const char* Joystick::_calibratedSettingsKey = "Calibrated4"; // Increment number to force recalibration
const char* Joystick::_buttonActionNameKey = "ButtonActionName%1"; const char* Joystick::_buttonActionNameKey = "ButtonActionName%1";
const char* Joystick::_buttonActionRepeatKey = "ButtonActionRepeat%1"; const char* Joystick::_buttonActionRepeatKey = "ButtonActionRepeat%1";
const char* Joystick::_buttonActionFrequencyKey = "ButtonActionFrequency%1";
const char* Joystick::_throttleModeSettingsKey = "ThrottleMode"; const char* Joystick::_throttleModeSettingsKey = "ThrottleMode";
const char* Joystick::_exponentialSettingsKey = "Exponential"; const char* Joystick::_exponentialSettingsKey = "Exponential";
const char* Joystick::_accumulatorSettingsKey = "Accumulator"; const char* Joystick::_accumulatorSettingsKey = "Accumulator";
const char* Joystick::_deadbandSettingsKey = "Deadband"; const char* Joystick::_deadbandSettingsKey = "Deadband";
const char* Joystick::_circleCorrectionSettingsKey = "Circle_Correction"; const char* Joystick::_circleCorrectionSettingsKey = "Circle_Correction";
const char* Joystick::_frequencySettingsKey = "Frequency"; const char* Joystick::_axisFrequencySettingsKey = "AxisFrequency";
const char* Joystick::_buttonFrequencySettingsKey = "ButtonFrequency";
const char* Joystick::_txModeSettingsKey = nullptr; const char* Joystick::_txModeSettingsKey = nullptr;
const char* Joystick::_fixedWingTXModeSettingsKey = "TXMode_FixedWing"; const char* Joystick::_fixedWingTXModeSettingsKey = "TXMode_FixedWing";
const char* Joystick::_multiRotorTXModeSettingsKey = "TXMode_MultiRotor"; const char* Joystick::_multiRotorTXModeSettingsKey = "TXMode_MultiRotor";
@ -108,9 +108,6 @@ Joystick::Joystick(const QString& name, int axisCount, int buttonCount, int hatC
_rgButtonValues[i] = BUTTON_UP; _rgButtonValues[i] = BUTTON_UP;
_buttonActionArray.append(nullptr); _buttonActionArray.append(nullptr);
} }
_updateTXModeSettingsKey(_multiVehicleManager->activeVehicle());
_loadSettings();
connect(_multiVehicleManager, &MultiVehicleManager::activeVehicleChanged, this, &Joystick::_activeVehicleChanged);
//-- Available Actions //-- Available Actions
_assignableButtonActions.append(new AssignableButtonAction(this, _buttonActionNone)); _assignableButtonActions.append(new AssignableButtonAction(this, _buttonActionNone));
_assignableButtonActions.append(new AssignableButtonAction(this, _buttonActionArm)); _assignableButtonActions.append(new AssignableButtonAction(this, _buttonActionArm));
@ -145,6 +142,9 @@ Joystick::Joystick(const QString& name, int axisCount, int buttonCount, int hatC
AssignableButtonAction* p = qobject_cast<AssignableButtonAction*>(_assignableButtonActions[i]); AssignableButtonAction* p = qobject_cast<AssignableButtonAction*>(_assignableButtonActions[i]);
_availableActionTitles << p->action(); _availableActionTitles << p->action();
} }
_updateTXModeSettingsKey(_multiVehicleManager->activeVehicle());
_loadSettings();
connect(_multiVehicleManager, &MultiVehicleManager::activeVehicleChanged, this, &Joystick::_activeVehicleChanged);
} }
Joystick::~Joystick() Joystick::~Joystick()
@ -192,7 +192,8 @@ void Joystick::_setDefaultCalibration(void) {
_exponential = 0; _exponential = 0;
_accumulator = false; _accumulator = false;
_deadband = false; _deadband = false;
_frequency = 25.0f; _axisFrequency = 25.0f;
_buttonFrequency= 5.0f;
_throttleMode = ThrottleModeDownZero; _throttleMode = ThrottleModeDownZero;
_calibrated = true; _calibrated = true;
_circleCorrection = false; _circleCorrection = false;
@ -254,7 +255,8 @@ void Joystick::_loadSettings()
_exponential = settings.value(_exponentialSettingsKey, 0).toFloat(); _exponential = settings.value(_exponentialSettingsKey, 0).toFloat();
_accumulator = settings.value(_accumulatorSettingsKey, false).toBool(); _accumulator = settings.value(_accumulatorSettingsKey, false).toBool();
_deadband = settings.value(_deadbandSettingsKey, false).toBool(); _deadband = settings.value(_deadbandSettingsKey, false).toBool();
_frequency = settings.value(_frequencySettingsKey, 25.0f).toFloat(); _axisFrequency = settings.value(_axisFrequencySettingsKey, 25.0f).toFloat();
_buttonFrequency= settings.value(_buttonFrequencySettingsKey, 5.0f).toFloat();
_circleCorrection = settings.value(_circleCorrectionSettingsKey, false).toBool(); _circleCorrection = settings.value(_circleCorrectionSettingsKey, false).toBool();
_gimbalEnabled = settings.value(_gimbalSettingsKey, false).toBool(); _gimbalEnabled = settings.value(_gimbalSettingsKey, false).toBool();
@ -289,15 +291,20 @@ void Joystick::_loadSettings()
qCDebug(JoystickLog) << "_loadSettings axis:min:max:trim:reversed:deadband:badsettings" << axis << calibration->min << calibration->max << calibration->center << calibration->reversed << calibration->deadband << badSettings; qCDebug(JoystickLog) << "_loadSettings axis:min:max:trim:reversed:deadband:badsettings" << axis << calibration->min << calibration->max << calibration->center << calibration->reversed << calibration->deadband << badSettings;
} }
int workingAxis = 0;
for (int function = 0; function < maxFunction; function++) { for (int function = 0; function < maxFunction; function++) {
int functionAxis; int functionAxis;
functionAxis = settings.value(_rgFunctionSettingsKey[function], -1).toInt(&convertOk); functionAxis = settings.value(_rgFunctionSettingsKey[function], -1).toInt(&convertOk);
badSettings |= !convertOk || (functionAxis == -1) || (functionAxis >= _axisCount); badSettings |= !convertOk || (functionAxis >= _axisCount);
if(functionAxis >= 0) {
workingAxis++;
}
if(functionAxis < _axisCount) { if(functionAxis < _axisCount) {
_rgFunctionAxis[function] = functionAxis; _rgFunctionAxis[function] = functionAxis;
} }
qCDebug(JoystickLog) << "_loadSettings function:axis:badsettings" << function << functionAxis << badSettings; qCDebug(JoystickLog) << "_loadSettings function:axis:badsettings" << function << functionAxis << badSettings;
} }
badSettings |= workingAxis < 4;
// FunctionAxis mappings are always stored in TX mode 2 // FunctionAxis mappings are always stored in TX mode 2
// Remap to stored TX mode in settings // Remap to stored TX mode in settings
@ -311,10 +318,9 @@ void Joystick::_loadSettings()
} }
AssignedButtonAction* ap = new AssignedButtonAction(this, a); AssignedButtonAction* ap = new AssignedButtonAction(this, a);
ap->repeat = settings.value(QString(_buttonActionRepeatKey).arg(button), false).toBool(); ap->repeat = settings.value(QString(_buttonActionRepeatKey).arg(button), false).toBool();
ap->frequency = settings.value(QString(_buttonActionFrequencyKey).arg(button), 1).toInt();
if(ap->frequency > 25.0f) ap->frequency = 25.0f;
_buttonActionArray[button] = ap; _buttonActionArray[button] = ap;
qCDebug(JoystickLog) << "_loadSettings button:action" << button << _buttonActionArray[button]->action << _buttonActionArray[button]->repeat << _buttonActionArray[button]->frequency; _buttonActionArray[button]->buttonTime.start();
qCDebug(JoystickLog) << "_loadSettings button:action" << button << _buttonActionArray[button]->action << _buttonActionArray[button]->repeat;
} }
} }
@ -333,8 +339,7 @@ void Joystick::_saveButtonSettings()
if(_buttonActionArray[button]) { if(_buttonActionArray[button]) {
settings.setValue(QString(_buttonActionNameKey).arg(button), _buttonActionArray[button]->action); settings.setValue(QString(_buttonActionNameKey).arg(button), _buttonActionArray[button]->action);
settings.setValue(QString(_buttonActionRepeatKey).arg(button), _buttonActionArray[button]->repeat); settings.setValue(QString(_buttonActionRepeatKey).arg(button), _buttonActionArray[button]->repeat);
settings.setValue(QString(_buttonActionFrequencyKey).arg(button), _buttonActionArray[button]->frequency); qCDebug(JoystickLog) << "_saveButtonSettings button:action" << button << _buttonActionArray[button]->action << _buttonActionArray[button]->repeat;
qCDebug(JoystickLog) << "_saveButtonSettings button:action" << button << _buttonActionArray[button]->action << _buttonActionArray[button]->repeat << _buttonActionArray[button]->frequency;
} }
} }
} }
@ -354,7 +359,8 @@ void Joystick::_saveSettings()
settings.setValue(_exponentialSettingsKey, _exponential); settings.setValue(_exponentialSettingsKey, _exponential);
settings.setValue(_accumulatorSettingsKey, _accumulator); settings.setValue(_accumulatorSettingsKey, _accumulator);
settings.setValue(_deadbandSettingsKey, _deadband); settings.setValue(_deadbandSettingsKey, _deadband);
settings.setValue(_frequencySettingsKey, _frequency); settings.setValue(_axisFrequencySettingsKey, _axisFrequency);
settings.setValue(_buttonFrequencySettingsKey, _buttonFrequency);
settings.setValue(_throttleModeSettingsKey, _throttleMode); settings.setValue(_throttleModeSettingsKey, _throttleMode);
settings.setValue(_gimbalSettingsKey, _gimbalEnabled); settings.setValue(_gimbalSettingsKey, _gimbalEnabled);
settings.setValue(_circleCorrectionSettingsKey, _circleCorrection); settings.setValue(_circleCorrectionSettingsKey, _circleCorrection);
@ -534,31 +540,30 @@ void Joystick::_handleButtons()
} }
//-- Process button press //-- Process button press
for (int buttonIndex = 0; buttonIndex < _totalButtonCount; buttonIndex++) { for (int buttonIndex = 0; buttonIndex < _totalButtonCount; buttonIndex++) {
//-- This button just went down if(_rgButtonValues[buttonIndex] == BUTTON_DOWN || _rgButtonValues[buttonIndex] == BUTTON_REPEAT) {
if(_rgButtonValues[buttonIndex] == BUTTON_DOWN) {
//-- Flag it as processed
_rgButtonValues[buttonIndex] = BUTTON_REPEAT;
//-- Process single button
if(_buttonActionArray[buttonIndex]) { if(_buttonActionArray[buttonIndex]) {
if(!_buttonActionArray[buttonIndex]->repeat || _buttonActionArray[buttonIndex]->frequency == 0) {
QString buttonAction = _buttonActionArray[buttonIndex]->action; QString buttonAction = _buttonActionArray[buttonIndex]->action;
if (!buttonAction.isEmpty()) { if(buttonAction.isEmpty() || buttonAction == _buttonActionNone)
continue;
//-- Process single button
if(!_buttonActionArray[buttonIndex]->repeat) {
//-- This button just went down
if(_rgButtonValues[buttonIndex] == BUTTON_DOWN) {
qCDebug(JoystickLog) << "Single button triggered" << buttonIndex << buttonAction; qCDebug(JoystickLog) << "Single button triggered" << buttonIndex << buttonAction;
_executeButtonAction(buttonAction); _executeButtonAction(buttonAction);
} }
} else { } else {
//-- Process repeat buttons //-- Process repeat buttons
int buttonDelay = static_cast<int>(1000.0f / _buttonActionArray[buttonIndex]->frequency); int buttonDelay = static_cast<int>(1000.0f / _buttonFrequency);
if(_buttonActionArray[buttonIndex]->buttonTime.elapsed() > buttonDelay) { if(_buttonActionArray[buttonIndex]->buttonTime.elapsed() > buttonDelay) {
_buttonActionArray[buttonIndex]->buttonTime.start(); _buttonActionArray[buttonIndex]->buttonTime.start();
QString buttonAction = _buttonActionArray[buttonIndex]->action;
if (!buttonAction.isEmpty()) {
qCDebug(JoystickLog) << "Repeat button triggered" << buttonIndex << buttonAction; qCDebug(JoystickLog) << "Repeat button triggered" << buttonIndex << buttonAction;
_executeButtonAction(buttonAction); _executeButtonAction(buttonAction);
} }
} }
} }
} //-- Flag it as processed
_rgButtonValues[buttonIndex] = BUTTON_REPEAT;
} }
} }
} }
@ -566,7 +571,7 @@ void Joystick::_handleButtons()
void Joystick::_handleAxis() void Joystick::_handleAxis()
{ {
//-- Get frequency //-- Get frequency
int axisDelay = static_cast<int>(1000.0f / _frequency); int axisDelay = static_cast<int>(1000.0f / _axisFrequency);
//-- Check elapsed time since last run //-- Check elapsed time since last run
if(_axisTime.elapsed() > axisDelay) { if(_axisTime.elapsed() > axisDelay) {
_axisTime.start(); _axisTime.start();
@ -729,7 +734,6 @@ void Joystick::stopPolling(void)
void Joystick::setCalibration(int axis, Calibration_t& calibration) void Joystick::setCalibration(int axis, Calibration_t& calibration)
{ {
if (!_validAxis(axis)) { if (!_validAxis(axis)) {
qCWarning(JoystickLog) << "Invalid axis index" << axis;
return; return;
} }
_calibrated = true; _calibrated = true;
@ -741,16 +745,14 @@ void Joystick::setCalibration(int axis, Calibration_t& calibration)
Joystick::Calibration_t Joystick::getCalibration(int axis) Joystick::Calibration_t Joystick::getCalibration(int axis)
{ {
if (!_validAxis(axis)) { if (!_validAxis(axis)) {
qCWarning(JoystickLog) << "Invalid axis index" << axis; return Calibration_t();
} }
return _rgCalibration[axis]; return _rgCalibration[axis];
} }
void Joystick::setFunctionAxis(AxisFunction_t function, int axis) void Joystick::setFunctionAxis(AxisFunction_t function, int axis)
{ {
if (!_validAxis(axis)) { if (!_validAxis(axis)) {
qCWarning(JoystickLog) << "Invalid axis index" << axis;
return; return;
} }
_calibrated = true; _calibrated = true;
@ -773,16 +775,20 @@ void Joystick::setButtonRepeat(int button, bool repeat)
return; return;
} }
_buttonActionArray[button]->repeat = repeat; _buttonActionArray[button]->repeat = repeat;
_saveButtonSettings(); _buttonActionArray[button]->buttonTime.start();
//-- Save to settings
QSettings settings;
settings.beginGroup(_settingsGroup);
settings.beginGroup(_name);
settings.setValue(QString(_buttonActionRepeatKey).arg(button), _buttonActionArray[button]->repeat);
} }
void Joystick::setButtonFrequency(int button, int freq) bool Joystick::getButtonRepeat(int button)
{ {
if (!_validButton(button) || !_buttonActionArray[button]) { if (!_validButton(button) || !_buttonActionArray[button]) {
return; return false;
} }
_buttonActionArray[button]->frequency = freq; return _buttonActionArray[button]->repeat;
_saveButtonSettings();
} }
void Joystick::setButtonAction(int button, const QString& action) void Joystick::setButtonAction(int button, const QString& action)
@ -791,10 +797,16 @@ void Joystick::setButtonAction(int button, const QString& action)
return; return;
} }
qCWarning(JoystickLog) << "setButtonAction:" << button << action; qCWarning(JoystickLog) << "setButtonAction:" << button << action;
QSettings settings;
settings.beginGroup(_settingsGroup);
settings.beginGroup(_name);
if(action.isEmpty() || action == _buttonActionNone) { if(action.isEmpty() || action == _buttonActionNone) {
if(_buttonActionArray[button]) { if(_buttonActionArray[button]) {
_buttonActionArray[button]->deleteLater(); _buttonActionArray[button]->deleteLater();
_buttonActionArray[button] = nullptr; _buttonActionArray[button] = nullptr;
//-- Clear from settings
settings.remove(QString(_buttonActionNameKey).arg(button));
settings.remove(QString(_buttonActionRepeatKey).arg(button));
} }
} else { } else {
if(!_buttonActionArray[button]) { if(!_buttonActionArray[button]) {
@ -810,8 +822,10 @@ void Joystick::setButtonAction(int button, const QString& action)
} }
} }
} }
//-- Save to settings
settings.setValue(QString(_buttonActionNameKey).arg(button), _buttonActionArray[button]->action);
settings.setValue(QString(_buttonActionRepeatKey).arg(button), _buttonActionArray[button]->repeat);
} }
_saveButtonSettings();
emit buttonActionsChanged(); emit buttonActionsChanged();
} }
@ -915,11 +929,6 @@ void Joystick::setCircleCorrection(bool circleCorrection)
emit circleCorrectionChanged(_circleCorrection); emit circleCorrectionChanged(_circleCorrection);
} }
float Joystick::frequency()
{
return _frequency;
}
void Joystick::setGimbalEnabled(bool set) void Joystick::setGimbalEnabled(bool set)
{ {
_gimbalEnabled = set; _gimbalEnabled = set;
@ -927,14 +936,24 @@ void Joystick::setGimbalEnabled(bool set)
emit gimbalEnabledChanged(); emit gimbalEnabledChanged();
} }
void Joystick::setFrequency(float val) void Joystick::setAxisFrequency(float val)
{
//-- Arbitrary limits
if(val < 0.25f) val = 0.25f;
if(val > 50.0f) val = 50.0f;
_axisFrequency = val;
_saveSettings();
emit axisFrequencyChanged();
}
void Joystick::setButtonFrequency(float val)
{ {
//-- Arbitrary limits //-- Arbitrary limits
if(val < 0.25f) val = 0.25f; if(val < 0.25f) val = 0.25f;
if(val > 50.0f) val = 50.0f; if(val > 50.0f) val = 50.0f;
_frequency = val; _buttonFrequency = val;
_saveSettings(); _saveSettings();
emit frequencyChanged(); emit buttonFrequencyChanged();
} }
void Joystick::setCalibrationMode(bool calibrating) void Joystick::setCalibrationMode(bool calibrating)
@ -1000,7 +1019,11 @@ void Joystick::_executeButtonAction(const QString& action)
bool Joystick::_validAxis(int axis) bool Joystick::_validAxis(int axis)
{ {
return axis >= 0 && axis < _axisCount; if(axis >= 0 && axis < _axisCount) {
return true;
}
qCWarning(JoystickLog) << "Invalid axis index" << axis;
return false;
} }
bool Joystick::_validButton(int button) bool Joystick::_validButton(int button)

23
src/Joystick/Joystick.h
Unescape View File

@ -29,7 +29,6 @@ public:
QString action; QString action;
QTime buttonTime; QTime buttonTime;
bool repeat = false; bool repeat = false;
int frequency = 1;
}; };
//-- Assignable Button Action //-- Assignable Button Action
@ -100,14 +99,15 @@ public:
Q_PROPERTY(bool gimbalEnabled READ gimbalEnabled WRITE setGimbalEnabled NOTIFY gimbalEnabledChanged) Q_PROPERTY(bool gimbalEnabled READ gimbalEnabled WRITE setGimbalEnabled NOTIFY gimbalEnabledChanged)
Q_PROPERTY(int throttleMode READ throttleMode WRITE setThrottleMode NOTIFY throttleModeChanged) Q_PROPERTY(int throttleMode READ throttleMode WRITE setThrottleMode NOTIFY throttleModeChanged)
Q_PROPERTY(float frequency READ frequency WRITE setFrequency NOTIFY frequencyChanged) Q_PROPERTY(float axisFrequency READ axisFrequency WRITE setAxisFrequency NOTIFY axisFrequencyChanged)
Q_PROPERTY(float buttonFrequency READ buttonFrequency WRITE setButtonFrequency NOTIFY buttonFrequencyChanged)
Q_PROPERTY(bool negativeThrust READ negativeThrust WRITE setNegativeThrust NOTIFY negativeThrustChanged) Q_PROPERTY(bool negativeThrust READ negativeThrust WRITE setNegativeThrust NOTIFY negativeThrustChanged)
Q_PROPERTY(float exponential READ exponential WRITE setExponential NOTIFY exponentialChanged) Q_PROPERTY(float exponential READ exponential WRITE setExponential NOTIFY exponentialChanged)
Q_PROPERTY(bool accumulator READ accumulator WRITE setAccumulator NOTIFY accumulatorChanged) Q_PROPERTY(bool accumulator READ accumulator WRITE setAccumulator NOTIFY accumulatorChanged)
Q_PROPERTY(bool circleCorrection READ circleCorrection WRITE setCircleCorrection NOTIFY circleCorrectionChanged) Q_PROPERTY(bool circleCorrection READ circleCorrection WRITE setCircleCorrection NOTIFY circleCorrectionChanged)
Q_INVOKABLE void setButtonRepeat (int button, bool repeat); Q_INVOKABLE void setButtonRepeat (int button, bool repeat);
Q_INVOKABLE void setButtonFrequency (int button, int freq); Q_INVOKABLE bool getButtonRepeat (int button);
Q_INVOKABLE void setButtonAction (int button, const QString& action); Q_INVOKABLE void setButtonAction (int button, const QString& action);
Q_INVOKABLE QString getButtonAction (int button); Q_INVOKABLE QString getButtonAction (int button);
@ -168,8 +168,11 @@ public:
/// Set the current calibration mode /// Set the current calibration mode
void setCalibrationMode (bool calibrating); void setCalibrationMode (bool calibrating);
float frequency (); float axisFrequency () { return _axisFrequency; }
void setFrequency (float val); void setAxisFrequency (float val);
float buttonFrequency () { return _buttonFrequency; }
void setButtonFrequency(float val);
signals: signals:
// The raw signals are only meant for use by calibration // The raw signals are only meant for use by calibration
@ -196,7 +199,8 @@ signals:
void buttonActionTriggered (int action); void buttonActionTriggered (int action);
void gimbalEnabledChanged (); void gimbalEnabledChanged ();
void frequencyChanged (); void axisFrequencyChanged ();
void buttonFrequencyChanged ();
void startContinuousZoom (int direction); void startContinuousZoom (int direction);
void stopContinuousZoom (); void stopContinuousZoom ();
void stepZoom (int direction); void stepZoom (int direction);
@ -262,7 +266,8 @@ protected:
bool _accumulator = false; bool _accumulator = false;
bool _deadband = false; bool _deadband = false;
bool _circleCorrection = true; bool _circleCorrection = true;
float _frequency = 25.0f; float _axisFrequency = 25.0f;
float _buttonFrequency = 5.0f;
Vehicle* _activeVehicle = nullptr; Vehicle* _activeVehicle = nullptr;
bool _gimbalEnabled = false; bool _gimbalEnabled = false;
@ -292,13 +297,13 @@ private:
static const char* _calibratedSettingsKey; static const char* _calibratedSettingsKey;
static const char* _buttonActionNameKey; static const char* _buttonActionNameKey;
static const char* _buttonActionRepeatKey; static const char* _buttonActionRepeatKey;
static const char* _buttonActionFrequencyKey;
static const char* _throttleModeSettingsKey; static const char* _throttleModeSettingsKey;
static const char* _exponentialSettingsKey; static const char* _exponentialSettingsKey;
static const char* _accumulatorSettingsKey; static const char* _accumulatorSettingsKey;
static const char* _deadbandSettingsKey; static const char* _deadbandSettingsKey;
static const char* _circleCorrectionSettingsKey; static const char* _circleCorrectionSettingsKey;
static const char* _frequencySettingsKey; static const char* _axisFrequencySettingsKey;
static const char* _buttonFrequencySettingsKey;
static const char* _txModeSettingsKey; static const char* _txModeSettingsKey;
static const char* _fixedWingTXModeSettingsKey; static const char* _fixedWingTXModeSettingsKey;
static const char* _multiRotorTXModeSettingsKey; static const char* _multiRotorTXModeSettingsKey;

6
src/QmlControls/QmlObjectListModel.cc
Unescape View File

@ -168,19 +168,17 @@ void QmlObjectListModel::insert(int i, QObject* object)
if (i < 0 || i > _objectList.count()) { if (i < 0 || i > _objectList.count()) {
qWarning() << "Invalid index index:count" << i << _objectList.count(); qWarning() << "Invalid index index:count" << i << _objectList.count();
} }
if(object) {
QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership); QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
// Look for a dirtyChanged signal on the object // Look for a dirtyChanged signal on the object
if (object->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("dirtyChanged(bool)")) != -1) { if (object->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("dirtyChanged(bool)")) != -1) {
if (!_skipDirtyFirstItem || i != 0) { if (!_skipDirtyFirstItem || i != 0) {
QObject::connect(object, SIGNAL(dirtyChanged(bool)), this, SLOT(_childDirtyChanged(bool))); QObject::connect(object, SIGNAL(dirtyChanged(bool)), this, SLOT(_childDirtyChanged(bool)));
} }
} }
}
_objectList.insert(i, object); _objectList.insert(i, object);
insertRows(i, 1); insertRows(i, 1);
setDirty(true); setDirty(true);
} }

3
src/VehicleSetup/JoystickConfig.qml
Unescape View File

@ -61,6 +61,9 @@ SetupPage {
QGCTabBar { QGCTabBar {
id: bar id: bar
width: parent.width width: parent.width
Component.onCompleted: {
currentIndex = _activeJoystick && _activeJoystick.calibrated ? 0 : 2
}
anchors.top: parent.top anchors.top: parent.top
QGCTabButton { QGCTabButton {
text: qsTr("General") text: qsTr("General")

28
src/VehicleSetup/JoystickConfigAdvanced.qml
Unescape View File

@ -144,20 +144,38 @@ Item {
visible: advancedSettings.checked visible: advancedSettings.checked
} }
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Message Frequency //-- Axis Message Frequency
QGCLabel { QGCLabel {
text: qsTr("Message frequency (Hz):") text: qsTr("Axis frequency (Hz):")
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
visible: advancedSettings.checked visible: advancedSettings.checked
} }
QGCTextField { QGCTextField {
text: _activeJoystick.frequency text: _activeJoystick.axisFrequency
enabled: advancedSettings.checked enabled: advancedSettings.checked
validator: DoubleValidator { bottom: 0.25; top: 100.0; } validator: DoubleValidator { bottom: 0.25; top: 50.0; }
inputMethodHints: Qt.ImhFormattedNumbersOnly inputMethodHints: Qt.ImhFormattedNumbersOnly
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
onEditingFinished: { onEditingFinished: {
_activeJoystick.frequency = parseFloat(text) _activeJoystick.axisFrequency = parseFloat(text)
}
visible: advancedSettings.checked
}
//-----------------------------------------------------------------
//-- Button Repeat Frequency
QGCLabel {
text: qsTr("Button repeat frequency (Hz):")
Layout.alignment: Qt.AlignVCenter
visible: advancedSettings.checked
}
QGCTextField {
text: _activeJoystick.buttonFrequency
enabled: advancedSettings.checked
validator: DoubleValidator { bottom: 0.25; top: 50.0; }
inputMethodHints: Qt.ImhFormattedNumbersOnly
Layout.alignment: Qt.AlignVCenter
onEditingFinished: {
_activeJoystick.buttonFrequency = parseFloat(text)
} }
visible: advancedSettings.checked visible: advancedSettings.checked
} }

30
src/VehicleSetup/JoystickConfigButtons.qml
Unescape View File

@ -46,7 +46,7 @@ Item {
Row { Row {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
property bool pressed property bool pressed
property var currentAction: _activeJoystick ? _activeJoystick.assignableActions.get(buttonActionCombo.currentIndex) : null property var currentAssignableAction: _activeJoystick ? _activeJoystick.assignableActions.get(buttonActionCombo.currentIndex) : null
Rectangle { Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: ScreenTools.defaultFontPixelHeight * 1.5 width: ScreenTools.defaultFontPixelHeight * 1.5
@ -73,39 +73,23 @@ Item {
if(_activeJoystick) { if(_activeJoystick) {
var i = find(_activeJoystick.buttonActions[modelData]) var i = find(_activeJoystick.buttonActions[modelData])
if(i < 0) i = 0 if(i < 0) i = 0
currentIndex = 0 currentIndex = i
} }
} }
} }
QGCCheckBox { QGCCheckBox {
id: repeatCheck id: repeatCheck
text: qsTr("Repeat") text: qsTr("Repeat")
enabled: currentAction && _activeJoystick.calibrated && currentAction.canRepeat enabled: currentAssignableAction && _activeJoystick.calibrated && currentAssignableAction.canRepeat
onClicked: { onClicked: {
_activeJoystick.setButtonRepeat(modelData, checked) _activeJoystick.setButtonRepeat(modelData, checked)
} }
anchors.verticalCenter: parent.verticalCenter
}
QGCComboBox {
width: ScreenTools.defaultFontPixelWidth * 10
model: ["1Hz","2Hz","5Hz","10Hz","25Hz"]
enabled: repeatCheck.checked
onActivated: {
var freq = 1;
switch(index) {
case 0: freq = 1; break;
case 1: freq = 2; break;
case 2: freq = 5; break;
case 3: freq = 10; break;
case 4: freq = 25; break;
}
_activeJoystick.setButtonFrequency(modelData, freq)
}
Component.onCompleted: { Component.onCompleted: {
if(_activeJoystick) {
checked = _activeJoystick.getButtonRepeat(modelData)
}
} }
anchors.verticalCenter: parent.verticalCenter
} }
Item { Item {
width: ScreenTools.defaultFontPixelWidth * 2 width: ScreenTools.defaultFontPixelWidth * 2

Write Preview
Loading…
Cancel
Save