diff --git a/VoidLink/Input/ControllerSupport.m b/VoidLink/Input/ControllerSupport.m index 31ce2b9f..46aa31ff 100644 --- a/VoidLink/Input/ControllerSupport.m +++ b/VoidLink/Input/ControllerSupport.m @@ -72,9 +72,9 @@ static void ApplyAdaptiveTriggerEffect(GCDualSenseAdaptiveTrigger* trigger, } break; case 0x06: - [trigger setModeVibrationWithStartPosition:effect.parameter0 + [trigger setModeVibrationWithStartPosition:effect.parameter2 amplitude:effect.parameter1 - frequency:effect.parameter2]; + frequency:effect.parameter0]; break; default: // Log(LOG_W, @"Ignoring unsupported adaptive trigger effect type: 0x%02X", effect.type); @@ -526,12 +526,12 @@ static void ApplyAdaptiveTriggerEffect(GCDualSenseAdaptiveTrigger* trigger, i == DS_EFFECT_PAYLOAD_SIZE - 1 ? "%02X" : "%02X ", right[i]); } - /* + Log(LOG_I, @"Adaptive trigger: controller=%u flags=0x%02X " "leftType=0x%02X left=[%s] rightType=0x%02X right=[%s]", controllerNumber, eventFlags, typeLeft, leftPayload, typeRight, rightPayload); - */ + VL_ADAPTIVE_TRIGGER_EFFECT leftEffect = DecodeAdaptiveTriggerEffect(typeLeft, left); VL_ADAPTIVE_TRIGGER_EFFECT rightEffect = DecodeAdaptiveTriggerEffect(typeRight, right); diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift index fcbc693a..14e66b8c 100644 --- a/VoidLink/Input/OnScreenWidgetView.swift +++ b/VoidLink/Input/OnScreenWidgetView.swift @@ -705,6 +705,7 @@ import ObjectiveC.runtime self.isMultipleTouchEnabled = self.widgetType == WidgetTypeEnum.button || CommandManager.mousePadWithButtonActions.contains(self.touchPadString) || self.touchPadString == "MAGNIFIER" + || self.touchPadString == "DS4TOUCH" } // ====================================================================================================== @@ -2270,7 +2271,10 @@ import ObjectiveC.runtime case "DS4TOUCH": if quickDoubleTapDetected { self.showl3r3Indicator() - self.sendComboButtonsDownEvent(comboStrings: self.comboButtonStrings)} + if activeTouchesCount < 2 { + self.sendComboButtonsDownEvent(comboStrings: self.comboButtonStrings) + } + } case "DPAD", "WASDPAD", "ARROWPAD": if activeTouchesCount == 1 { // showLrudBall(at: touchBeganLocation)