diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index 18437941898915e1920fb8c88f225eab14a37b13..0f9adfc1b3abba1f430d95292f8d15864188c15f 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -202,11 +202,6 @@ SetupPage { property bool reversed: controller.rollAxisReversed } - Connections { - target: controller - - onRollAxisDeadbandChanged: rollLoader.item.deadbandValue = value - } Connections { target: _activeJoystick @@ -237,12 +232,6 @@ SetupPage { property bool reversed: controller.pitchAxisReversed } - Connections { - target: controller - - onPitchAxisDeadbandChanged: pitchLoader.item.deadbandValue = value - - } Connections { target: _activeJoystick @@ -273,11 +262,6 @@ SetupPage { property bool reversed: controller.yawAxisReversed } - Connections { - target: controller - - onYawAxisDeadbandChanged: yawLoader.item.deadbandValue = value - } Connections { target: _activeJoystick @@ -308,11 +292,6 @@ SetupPage { property bool reversed: controller.throttleAxisReversed } - Connections { - target: controller - - onThrottleAxisDeadbandChanged: throttleLoader.item.deadbandValue = value - } Connections { target: _activeJoystick @@ -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 43f8e9a25ec57daa43c6d309d24f3b487a8a7165..d2197756874f830548e93a67adac7ac1f055471e 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 342d146c4f82818cbb11f2dbb5037b2b629570fe..73046705c5653116398e14e484104ad5779e861f 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);