From 7131a12e26028251b26c4439b991ee763b9c1541 Mon Sep 17 00:00:00 2001 From: nanthony21 Date: Sat, 25 Feb 2017 14:20:37 -0600 Subject: [PATCH 1/8] changed message to explain deadband calibration --- src/VehicleSetup/JoystickConfigController.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc index 0c4446b..5dcf49b 100644 --- a/src/VehicleSetup/JoystickConfigController.cc +++ b/src/VehicleSetup/JoystickConfigController.cc @@ -81,7 +81,7 @@ JoystickConfigController::~JoystickConfigController() /// @brief Returns the state machine entry for the specified state. const JoystickConfigController::stateMachineEntry* JoystickConfigController::_getStateMachineEntry(int step) { - static const char* msgBegin = "Allow all sticks to center as shown in diagram.\n\nClick Next to continue"; + static const char* msgBegin = "Allow all sticks to center as shown in diagram.\nIf using deadband, move all axes through extent of deadzone before proceeding.\nClick Next to continue"; static const char* msgThrottleUp = "Move the Throttle stick all the way up and hold it there..."; static const char* msgThrottleDown = "Move the Throttle stick all the way down and hold it there..."; static const char* msgYawLeft = "Move the Yaw stick all the way to the left and hold it there..."; From 1169c0983a4409272e83c4d3848941a354609a8e Mon Sep 17 00:00:00 2001 From: nanthony21 Date: Sat, 25 Feb 2017 14:55:20 -0600 Subject: [PATCH 2/8] Mapped left column indicators to the manualControl signal that is sent to the vehicle --- src/VehicleSetup/JoystickConfig.qml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index 066146b..1843794 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -205,10 +205,13 @@ SetupPage { Connections { target: controller - onRollAxisValueChanged: rollLoader.item.axisValue = value - onRollAxisDeadbandChanged: rollLoader.item.deadbandValue = value } + Connections { + target: _activeJoystick + + onManualControl: rollLoader.item.axisValue = roll*32768.0 + } } Item { @@ -237,11 +240,14 @@ SetupPage { Connections { target: controller - onPitchAxisValueChanged: pitchLoader.item.axisValue = value - onPitchAxisDeadbandChanged: pitchLoader.item.deadbandValue = value } + Connections { + target: _activeJoystick + + onManualControl: pitchLoader.item.axisValue = pitch*32768.0 + } } Item { @@ -270,10 +276,13 @@ SetupPage { Connections { target: controller - onYawAxisValueChanged: yawLoader.item.axisValue = value - onYawAxisDeadbandChanged: yawLoader.item.deadbandValue = value } + Connections { + target: _activeJoystick + + onManualControl: yawLoader.item.axisValue = yaw*32768.0 + } } Item { @@ -302,10 +311,13 @@ SetupPage { Connections { target: controller - onThrottleAxisValueChanged: throttleLoader.item.axisValue = value - onThrottleAxisDeadbandChanged: throttleLoader.item.deadbandValue = value } + Connections { + target: _activeJoystick + + onManualControl: throttleLoader.item.axisValue = (-2*throttle+1)*32768.0 + } } } // Column - Attitude Control labels From 61d087231ce2f64798e22d31043195c6ee067f3e Mon Sep 17 00:00:00 2001 From: nanthony21 Date: Sat, 25 Feb 2017 15:18:13 -0600 Subject: [PATCH 3/8] Fixed spelling of attitude --- src/AutoPilotPlugins/Common/RadioComponentController.cc | 8 ++++---- src/AutoPilotPlugins/Common/RadioComponentController.h | 2 +- src/VehicleSetup/JoystickConfigController.cc | 10 +++++----- src/VehicleSetup/JoystickConfigController.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.cc b/src/AutoPilotPlugins/Common/RadioComponentController.cc index f64f295..59c84b8 100644 --- a/src/AutoPilotPlugins/Common/RadioComponentController.cc +++ b/src/AutoPilotPlugins/Common/RadioComponentController.cc @@ -429,7 +429,7 @@ void RadioComponentController::_inputStickDetect(enum rcCalFunctions function, i _rgChannelInfo[channel].rcMax = value; } - _signalAllAttiudeValueChanges(); + _signalAllAttitudeValueChanges(); _advanceState(); } @@ -582,7 +582,7 @@ void RadioComponentController::_resetInternalCalibrationValues(void) _rgFunctionChannelMapping[i] = _chanMax(); } - _signalAllAttiudeValueChanges(); + _signalAllAttitudeValueChanges(); } /// @brief Sets internal calibration values from the stored parameters @@ -654,7 +654,7 @@ void RadioComponentController::_setInternalCalibrationValuesFromParameters(void) } } - _signalAllAttiudeValueChanges(); + _signalAllAttitudeValueChanges(); } void RadioComponentController::spektrumBindMode(int mode) @@ -1023,7 +1023,7 @@ void RadioComponentController::setTransmitterMode(int mode) } } -void RadioComponentController::_signalAllAttiudeValueChanges(void) +void RadioComponentController::_signalAllAttitudeValueChanges(void) { emit rollChannelMappedChanged(rollChannelMapped()); emit pitchChannelMappedChanged(pitchChannelMapped()); diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.h b/src/AutoPilotPlugins/Common/RadioComponentController.h index 57f0ff0..a152608 100644 --- a/src/AutoPilotPlugins/Common/RadioComponentController.h +++ b/src/AutoPilotPlugins/Common/RadioComponentController.h @@ -230,7 +230,7 @@ private: void _loadSettings(void); void _storeSettings(void); - void _signalAllAttiudeValueChanges(void); + void _signalAllAttitudeValueChanges(void); int _chanMax(void) const; diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc index 5dcf49b..43f8e9a 100644 --- a/src/VehicleSetup/JoystickConfigController.cc +++ b/src/VehicleSetup/JoystickConfigController.cc @@ -223,7 +223,7 @@ bool JoystickConfigController::getDeadbandToggle() { void JoystickConfigController::setDeadbandToggle(bool deadband) { _activeJoystick->setDeadband(deadband); - _signalAllAttiudeValueChanges(); + _signalAllAttitudeValueChanges(); emit deadbandToggled(deadband); } @@ -353,7 +353,7 @@ void JoystickConfigController::_inputStickDetect(Joystick::AxisFunction_t functi qCDebug(JoystickConfigControllerLog) << "_inputStickDetect saving values, function:axis:value:reversed:_axisValueSave" << function << axis << value << info->reversed << _axisValueSave[axis]; - _signalAllAttiudeValueChanges(); + _signalAllAttitudeValueChanges(); _advanceState(); } @@ -461,7 +461,7 @@ void JoystickConfigController::_resetInternalCalibrationValues(void) _rgFunctionAxisMapping[i] = _axisNoAxis; } - _signalAllAttiudeValueChanges(); + _signalAllAttitudeValueChanges(); } /// @brief Sets internal calibration values from the stored settings @@ -505,7 +505,7 @@ void JoystickConfigController::_setInternalCalibrationValuesFromSettings(void) _transmitterMode = joystick->getTXMode(); - _signalAllAttiudeValueChanges(); + _signalAllAttitudeValueChanges(); } /// @brief Validates the current settings against the calibration rules resetting values as necessary. @@ -825,7 +825,7 @@ void JoystickConfigController::setTransmitterMode(int mode) } } -void JoystickConfigController::_signalAllAttiudeValueChanges(void) +void JoystickConfigController::_signalAllAttitudeValueChanges(void) { emit rollAxisMappedChanged(rollAxisMapped()); emit pitchAxisMappedChanged(pitchAxisMapped()); diff --git a/src/VehicleSetup/JoystickConfigController.h b/src/VehicleSetup/JoystickConfigController.h index c0c709c..342d146 100644 --- a/src/VehicleSetup/JoystickConfigController.h +++ b/src/VehicleSetup/JoystickConfigController.h @@ -217,7 +217,7 @@ private: void _setHelpImage(const char* imageFile); - void _signalAllAttiudeValueChanges(void); + void _signalAllAttitudeValueChanges(void); // Member variables From d4dbe920709e52d22e38d5cdbead28978ce2e9a3 Mon Sep 17 00:00:00 2001 From: nanthony21 Date: Sat, 25 Feb 2017 15:46:34 -0600 Subject: [PATCH 4/8] Moved deadband indicators to the right column. --- src/VehicleSetup/JoystickConfig.qml | 27 ++++++--------------------- src/VehicleSetup/JoystickConfigController.cc | 2 +- src/VehicleSetup/JoystickConfigController.h | 1 + 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index 1843794..0f9adfc 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -203,11 +203,6 @@ SetupPage { } Connections { - target: controller - - onRollAxisDeadbandChanged: rollLoader.item.deadbandValue = value - } - Connections { target: _activeJoystick onManualControl: rollLoader.item.axisValue = roll*32768.0 @@ -238,12 +233,6 @@ SetupPage { } Connections { - target: controller - - onPitchAxisDeadbandChanged: pitchLoader.item.deadbandValue = value - - } - Connections { target: _activeJoystick onManualControl: pitchLoader.item.axisValue = pitch*32768.0 @@ -274,11 +263,6 @@ SetupPage { } Connections { - target: controller - - onYawAxisDeadbandChanged: yawLoader.item.deadbandValue = value - } - Connections { target: _activeJoystick onManualControl: yawLoader.item.axisValue = yaw*32768.0 @@ -309,11 +293,6 @@ SetupPage { } Connections { - target: controller - - onThrottleAxisDeadbandChanged: throttleLoader.item.deadbandValue = value - } - Connections { target: _activeJoystick onManualControl: throttleLoader.item.axisValue = (-2*throttle+1)*32768.0 @@ -758,6 +737,12 @@ SetupPage { axisMonitorRepeater.itemAt(axis).loader.item.axisValue = value } } + + onAxisDeadbandChanged: { + if (axisMonitorRepeater.itemAt(axis)) { + axisMonitorRepeater.itemAt(axis).loader.item.deadbandValue = value + } + } } Repeater { diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc index 43f8e9a..d219775 100644 --- a/src/VehicleSetup/JoystickConfigController.cc +++ b/src/VehicleSetup/JoystickConfigController.cc @@ -247,7 +247,7 @@ void JoystickConfigController::_axisDeadbandChanged(int axis, int value) value = abs(value)<_calValidMaxValue?abs(value):_calValidMaxValue; _rgAxisInfo[axis].deadband = value; - + emit axisDeadbandChanged(axis,value); qCDebug(JoystickConfigControllerLog) << "Axis:" << axis << "Deadband:" << _rgAxisInfo[axis].deadband; } diff --git a/src/VehicleSetup/JoystickConfigController.h b/src/VehicleSetup/JoystickConfigController.h index 342d146..7304670 100644 --- a/src/VehicleSetup/JoystickConfigController.h +++ b/src/VehicleSetup/JoystickConfigController.h @@ -110,6 +110,7 @@ public: signals: void axisValueChanged(int axis, int value); + void axisDeadbandChanged(int axis, int value); void rollAxisMappedChanged(bool mapped); void pitchAxisMappedChanged(bool mapped); From 0775d4446cf2f3532139a92400384ca683ea30c8 Mon Sep 17 00:00:00 2001 From: nanthony21 Date: Sat, 25 Feb 2017 20:58:32 -0600 Subject: [PATCH 5/8] Moved deadband indicators to the right side column. --- src/VehicleSetup/JoystickConfig.qml | 13 +++++++++++++ src/VehicleSetup/JoystickConfigController.cc | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index 0f9adfc..78da588 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -105,6 +105,7 @@ SetupPage { width: _deadbandWidth height: parent.height / 2 color: "#8c161a" + visible: controller.deadbandToggle property real _percentDeadband: ((2 * deadbandValue) / (32768.0 * 2)) property real _deadbandWidth: parent.width * _percentDeadband @@ -743,6 +744,18 @@ SetupPage { axisMonitorRepeater.itemAt(axis).loader.item.deadbandValue = value } } + onDeadbandToggled: { + if (value) { + for (var i=0;i<_activeJoystick.axisCount;i++) { + axisMonitorRepeater.itemAt(i).loader.item.deadbandBarVisible = true + } + } + else { + for (var i=0;i<_activeJoystick.axisCount;i++) { + axisMonitorRepeater.itemAt(i).loader.item.deadbandBarVisible = false + } + } + } } Repeater { diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc index d219775..2e8f08d 100644 --- a/src/VehicleSetup/JoystickConfigController.cc +++ b/src/VehicleSetup/JoystickConfigController.cc @@ -257,7 +257,7 @@ void JoystickConfigController::_inputCenterWaitBegin(Joystick::AxisFunction_t fu Q_UNUSED(function); //sensing deadband - if (abs(value)*1.1f>_rgAxisInfo[axis].deadband) { //add 10% on top of existing deadband + if ((abs(value)*1.1f>_rgAxisInfo[axis].deadband)&&(_activeJoystick->deadband())) { //add 10% on top of existing deadband _axisDeadbandChanged(axis,abs(value)*1.1f); } @@ -451,6 +451,7 @@ void JoystickConfigController::_resetInternalCalibrationValues(void) info->function = Joystick::maxFunction; info->reversed = false; info->deadband = 0; + emit axisDeadbandChanged(i,info->deadband); info->axisMin = JoystickConfigController::_calCenterPoint; info->axisMax = JoystickConfigController::_calCenterPoint; info->axisTrim = JoystickConfigController::_calCenterPoint; @@ -489,6 +490,7 @@ void JoystickConfigController::_setInternalCalibrationValuesFromSettings(void) info->axisMax = calibration.max; info->reversed = calibration.reversed; info->deadband = calibration.deadband; + emit axisDeadbandChanged(axis,info->deadband); qCDebug(JoystickConfigControllerLog) << "Read settings name:axis:min:max:trim:reversed" << joystick->name() << axis << info->axisMin << info->axisMax << info->axisTrim << info->reversed; } From 9d805767c7c8eec0bba1385779ad46f8c5072904 Mon Sep 17 00:00:00 2001 From: nanthony21 Date: Sat, 25 Feb 2017 22:51:48 -0600 Subject: [PATCH 6/8] Removed unneeded QML connection. --- src/VehicleSetup/JoystickConfig.qml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index 78da588..14a9f10 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -744,18 +744,6 @@ SetupPage { axisMonitorRepeater.itemAt(axis).loader.item.deadbandValue = value } } - onDeadbandToggled: { - if (value) { - for (var i=0;i<_activeJoystick.axisCount;i++) { - axisMonitorRepeater.itemAt(i).loader.item.deadbandBarVisible = true - } - } - else { - for (var i=0;i<_activeJoystick.axisCount;i++) { - axisMonitorRepeater.itemAt(i).loader.item.deadbandBarVisible = false - } - } - } } Repeater { From 64c86bf147e7e10e8f77d0d0e955c53a71ad785a Mon Sep 17 00:00:00 2001 From: nanthony21 Date: Sun, 26 Feb 2017 12:49:21 -0600 Subject: [PATCH 7/8] Removed unused code --- src/VehicleSetup/JoystickConfig.qml | 2 - src/VehicleSetup/JoystickConfigController.cc | 95 ---------------------------- src/VehicleSetup/JoystickConfigController.h | 30 --------- 3 files changed, 127 deletions(-) diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index 14a9f10..feb04bb 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -84,8 +84,6 @@ SetupPage { property int axisValue: 0 property int deadbandValue: 0 - property int __lastAxisValue: 0 - readonly property int __axisValueMaxJitter: 100 property color __barColor: qgcPal.windowShade // Bar diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc index 2e8f08d..d33283c 100644 --- a/src/VehicleSetup/JoystickConfigController.cc +++ b/src/VehicleSetup/JoystickConfigController.cc @@ -144,26 +144,6 @@ void JoystickConfigController::_axisValueChanged(int axis, int value) // We always update raw values _axisRawValue[axis] = value; emit axisValueChanged(axis, _axisRawValue[axis]); - - // Signal attitude axis values to Qml if mapped - if (_rgAxisInfo[axis].function != Joystick::maxFunction) { - switch (_rgAxisInfo[axis].function) { - case Joystick::rollFunction: - emit rollAxisValueChanged(_axisRawValue[axis]); - break; - case Joystick::pitchFunction: - emit pitchAxisValueChanged(_axisRawValue[axis]); - break; - case Joystick::yawFunction: - emit yawAxisValueChanged(_axisRawValue[axis]); - break; - case Joystick::throttleFunction: - emit throttleAxisValueChanged(_axisRawValue[axis]); - break; - default: - break; - } - } //qCDebug(JoystickConfigControllerLog) << "Raw value" << axis << value; @@ -685,77 +665,7 @@ int JoystickConfigController::axisCount(void) return _axisCount; } -int JoystickConfigController::rollAxisValue(void) -{ - if (_rgFunctionAxisMapping[Joystick::rollFunction] != _axisNoAxis) { - return _axisRawValue[Joystick::rollFunction]; - } else { - return 1500; - } -} - -int JoystickConfigController::pitchAxisValue(void) -{ - if (_rgFunctionAxisMapping[Joystick::pitchFunction] != _axisNoAxis) { - return _axisRawValue[Joystick::pitchFunction]; - } else { - return 1500; - } -} -int JoystickConfigController::yawAxisValue(void) -{ - if (_rgFunctionAxisMapping[Joystick::yawFunction] != _axisNoAxis) { - return _axisRawValue[Joystick::yawFunction]; - } else { - return 1500; - } -} - -int JoystickConfigController::throttleAxisValue(void) -{ - if (_rgFunctionAxisMapping[Joystick::throttleFunction] != _axisNoAxis) { - return _axisRawValue[Joystick::throttleFunction]; - } else { - return 1500; - } -} - -int JoystickConfigController::rollAxisDeadband(void) -{ - if ((_rgFunctionAxisMapping[Joystick::rollFunction] != _axisNoAxis) && (_activeJoystick->deadband())) { - return _rgAxisInfo[_rgFunctionAxisMapping[Joystick::rollFunction]].deadband; - } else { - return 0; - } -} - -int JoystickConfigController::pitchAxisDeadband(void) -{ - if ((_rgFunctionAxisMapping[Joystick::pitchFunction] != _axisNoAxis) && (_activeJoystick->deadband())) { - return _rgAxisInfo[_rgFunctionAxisMapping[Joystick::pitchFunction]].deadband; - } else { - return 0; - } -} - -int JoystickConfigController::yawAxisDeadband(void) -{ - if ((_rgFunctionAxisMapping[Joystick::yawFunction] != _axisNoAxis) && (_activeJoystick->deadband())) { - return _rgAxisInfo[_rgFunctionAxisMapping[Joystick::yawFunction]].deadband; - } else { - return 0; - } -} - -int JoystickConfigController::throttleAxisDeadband(void) -{ - if ((_rgFunctionAxisMapping[Joystick::throttleFunction] != _axisNoAxis) && (_activeJoystick->deadband())) { - return _rgAxisInfo[_rgFunctionAxisMapping[Joystick::throttleFunction]].deadband; - } else { - return 0; - } -} bool JoystickConfigController::rollAxisMapped(void) { @@ -839,11 +749,6 @@ void JoystickConfigController::_signalAllAttitudeValueChanges(void) emit yawAxisReversedChanged(yawAxisReversed()); emit throttleAxisReversedChanged(throttleAxisReversed()); - emit rollAxisDeadbandChanged(rollAxisDeadband()); - emit pitchAxisDeadbandChanged(pitchAxisDeadband()); - emit yawAxisDeadbandChanged(yawAxisDeadband()); - emit throttleAxisDeadbandChanged(throttleAxisDeadband()); - emit transmitterModeChanged(_transmitterMode); } diff --git a/src/VehicleSetup/JoystickConfigController.h b/src/VehicleSetup/JoystickConfigController.h index 7304670..d0e1faf 100644 --- a/src/VehicleSetup/JoystickConfigController.h +++ b/src/VehicleSetup/JoystickConfigController.h @@ -52,16 +52,6 @@ public: Q_PROPERTY(bool yawAxisMapped READ yawAxisMapped NOTIFY yawAxisMappedChanged) Q_PROPERTY(bool throttleAxisMapped READ throttleAxisMapped NOTIFY throttleAxisMappedChanged) - Q_PROPERTY(int rollAxisValue READ rollAxisValue NOTIFY rollAxisValueChanged) - Q_PROPERTY(int pitchAxisValue READ pitchAxisValue NOTIFY pitchAxisValueChanged) - Q_PROPERTY(int yawAxisValue READ yawAxisValue NOTIFY yawAxisValueChanged) - Q_PROPERTY(int throttleAxisValue READ throttleAxisValue NOTIFY throttleAxisValueChanged) - - Q_PROPERTY(int rollAxisDeadband READ rollAxisDeadband NOTIFY rollAxisDeadbandChanged) - Q_PROPERTY(int pitchAxisDeadband READ pitchAxisDeadband NOTIFY pitchAxisDeadbandChanged) - Q_PROPERTY(int yawAxisDeadband READ yawAxisDeadband NOTIFY yawAxisDeadbandChanged) - Q_PROPERTY(int throttleAxisDeadband READ throttleAxisDeadband NOTIFY throttleAxisDeadbandChanged) - Q_PROPERTY(int rollAxisReversed READ rollAxisReversed NOTIFY rollAxisReversedChanged) Q_PROPERTY(int pitchAxisReversed READ pitchAxisReversed NOTIFY pitchAxisReversedChanged) Q_PROPERTY(int yawAxisReversed READ yawAxisReversed NOTIFY yawAxisReversedChanged) @@ -78,16 +68,6 @@ public: Q_INVOKABLE void nextButtonClicked(void); Q_INVOKABLE void start(void); - int rollAxisValue(void); - int pitchAxisValue(void); - int yawAxisValue(void); - int throttleAxisValue(void); - - int rollAxisDeadband(void); - int pitchAxisDeadband(void); - int yawAxisDeadband(void); - int throttleAxisDeadband(void); - bool rollAxisMapped(void); bool pitchAxisMapped(void); bool yawAxisMapped(void); @@ -116,16 +96,6 @@ signals: void pitchAxisMappedChanged(bool mapped); void yawAxisMappedChanged(bool mapped); void throttleAxisMappedChanged(bool mapped); - - void rollAxisValueChanged(int value); - void pitchAxisValueChanged(int value); - void yawAxisValueChanged(int value); - void throttleAxisValueChanged(int value); - - void rollAxisDeadbandChanged(int value); - void pitchAxisDeadbandChanged(int value); - void yawAxisDeadbandChanged(int value); - void throttleAxisDeadbandChanged(int value); void rollAxisReversedChanged(bool reversed); void pitchAxisReversedChanged(bool reversed); From 09514ef79bdc177dc7a27663e1719167995d9310 Mon Sep 17 00:00:00 2001 From: Nick Anthony Date: Tue, 28 Feb 2017 15:04:41 -0600 Subject: [PATCH 8/8] Revert "changed message to explain deadband calibration" This reverts commit 7131a12e26028251b26c4439b991ee763b9c1541. --- src/VehicleSetup/JoystickConfigController.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc index d33283c..a7b5444 100644 --- a/src/VehicleSetup/JoystickConfigController.cc +++ b/src/VehicleSetup/JoystickConfigController.cc @@ -81,7 +81,7 @@ JoystickConfigController::~JoystickConfigController() /// @brief Returns the state machine entry for the specified state. const JoystickConfigController::stateMachineEntry* JoystickConfigController::_getStateMachineEntry(int step) { - static const char* msgBegin = "Allow all sticks to center as shown in diagram.\nIf using deadband, move all axes through extent of deadzone before proceeding.\nClick Next to continue"; + static const char* msgBegin = "Allow all sticks to center as shown in diagram.\n\nClick Next to continue"; static const char* msgThrottleUp = "Move the Throttle stick all the way up and hold it there..."; static const char* msgThrottleDown = "Move the Throttle stick all the way down and hold it there..."; static const char* msgYawLeft = "Move the Yaw stick all the way to the left and hold it there...";