Commit d4dbe920 authored by nanthony21's avatar nanthony21

Moved deadband indicators to the right column.

parent 61d08723
...@@ -202,11 +202,6 @@ SetupPage { ...@@ -202,11 +202,6 @@ SetupPage {
property bool reversed: controller.rollAxisReversed property bool reversed: controller.rollAxisReversed
} }
Connections {
target: controller
onRollAxisDeadbandChanged: rollLoader.item.deadbandValue = value
}
Connections { Connections {
target: _activeJoystick target: _activeJoystick
...@@ -237,12 +232,6 @@ SetupPage { ...@@ -237,12 +232,6 @@ SetupPage {
property bool reversed: controller.pitchAxisReversed property bool reversed: controller.pitchAxisReversed
} }
Connections {
target: controller
onPitchAxisDeadbandChanged: pitchLoader.item.deadbandValue = value
}
Connections { Connections {
target: _activeJoystick target: _activeJoystick
...@@ -273,11 +262,6 @@ SetupPage { ...@@ -273,11 +262,6 @@ SetupPage {
property bool reversed: controller.yawAxisReversed property bool reversed: controller.yawAxisReversed
} }
Connections {
target: controller
onYawAxisDeadbandChanged: yawLoader.item.deadbandValue = value
}
Connections { Connections {
target: _activeJoystick target: _activeJoystick
...@@ -308,11 +292,6 @@ SetupPage { ...@@ -308,11 +292,6 @@ SetupPage {
property bool reversed: controller.throttleAxisReversed property bool reversed: controller.throttleAxisReversed
} }
Connections {
target: controller
onThrottleAxisDeadbandChanged: throttleLoader.item.deadbandValue = value
}
Connections { Connections {
target: _activeJoystick target: _activeJoystick
...@@ -758,6 +737,12 @@ SetupPage { ...@@ -758,6 +737,12 @@ SetupPage {
axisMonitorRepeater.itemAt(axis).loader.item.axisValue = value axisMonitorRepeater.itemAt(axis).loader.item.axisValue = value
} }
} }
onAxisDeadbandChanged: {
if (axisMonitorRepeater.itemAt(axis)) {
axisMonitorRepeater.itemAt(axis).loader.item.deadbandValue = value
}
}
} }
Repeater { Repeater {
......
...@@ -247,7 +247,7 @@ void JoystickConfigController::_axisDeadbandChanged(int axis, int value) ...@@ -247,7 +247,7 @@ void JoystickConfigController::_axisDeadbandChanged(int axis, int value)
value = abs(value)<_calValidMaxValue?abs(value):_calValidMaxValue; value = abs(value)<_calValidMaxValue?abs(value):_calValidMaxValue;
_rgAxisInfo[axis].deadband = value; _rgAxisInfo[axis].deadband = value;
emit axisDeadbandChanged(axis,value);
qCDebug(JoystickConfigControllerLog) << "Axis:" << axis << "Deadband:" << _rgAxisInfo[axis].deadband; qCDebug(JoystickConfigControllerLog) << "Axis:" << axis << "Deadband:" << _rgAxisInfo[axis].deadband;
} }
......
...@@ -110,6 +110,7 @@ public: ...@@ -110,6 +110,7 @@ public:
signals: signals:
void axisValueChanged(int axis, int value); void axisValueChanged(int axis, int value);
void axisDeadbandChanged(int axis, int value);
void rollAxisMappedChanged(bool mapped); void rollAxisMappedChanged(bool mapped);
void pitchAxisMappedChanged(bool mapped); void pitchAxisMappedChanged(bool mapped);
......
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