adaptive trigger fixes

This commit is contained in:
True Zhuanjia
2026-08-16 19:28:39 +08:00
parent 4f0be34947
commit f1a4a519c3
2 changed files with 9 additions and 5 deletions
+4 -4
View File
@@ -72,9 +72,9 @@ static void ApplyAdaptiveTriggerEffect(GCDualSenseAdaptiveTrigger* trigger,
} }
break; break;
case 0x06: case 0x06:
[trigger setModeVibrationWithStartPosition:effect.parameter0 [trigger setModeVibrationWithStartPosition:effect.parameter2
amplitude:effect.parameter1 amplitude:effect.parameter1
frequency:effect.parameter2]; frequency:effect.parameter0];
break; break;
default: default:
// Log(LOG_W, @"Ignoring unsupported adaptive trigger effect type: 0x%02X", effect.type); // 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]); i == DS_EFFECT_PAYLOAD_SIZE - 1 ? "%02X" : "%02X ", right[i]);
} }
/*
Log(LOG_I, @"Adaptive trigger: controller=%u flags=0x%02X " Log(LOG_I, @"Adaptive trigger: controller=%u flags=0x%02X "
"leftType=0x%02X left=[%s] rightType=0x%02X right=[%s]", "leftType=0x%02X left=[%s] rightType=0x%02X right=[%s]",
controllerNumber, eventFlags, controllerNumber, eventFlags,
typeLeft, leftPayload, typeRight, rightPayload); typeLeft, leftPayload, typeRight, rightPayload);
*/
VL_ADAPTIVE_TRIGGER_EFFECT leftEffect = DecodeAdaptiveTriggerEffect(typeLeft, left); VL_ADAPTIVE_TRIGGER_EFFECT leftEffect = DecodeAdaptiveTriggerEffect(typeLeft, left);
VL_ADAPTIVE_TRIGGER_EFFECT rightEffect = DecodeAdaptiveTriggerEffect(typeRight, right); VL_ADAPTIVE_TRIGGER_EFFECT rightEffect = DecodeAdaptiveTriggerEffect(typeRight, right);
+5 -1
View File
@@ -705,6 +705,7 @@ import ObjectiveC.runtime
self.isMultipleTouchEnabled = self.widgetType == WidgetTypeEnum.button self.isMultipleTouchEnabled = self.widgetType == WidgetTypeEnum.button
|| CommandManager.mousePadWithButtonActions.contains(self.touchPadString) || CommandManager.mousePadWithButtonActions.contains(self.touchPadString)
|| self.touchPadString == "MAGNIFIER" || self.touchPadString == "MAGNIFIER"
|| self.touchPadString == "DS4TOUCH"
} }
// ====================================================================================================== // ======================================================================================================
@@ -2270,7 +2271,10 @@ import ObjectiveC.runtime
case "DS4TOUCH": case "DS4TOUCH":
if quickDoubleTapDetected { if quickDoubleTapDetected {
self.showl3r3Indicator() self.showl3r3Indicator()
self.sendComboButtonsDownEvent(comboStrings: self.comboButtonStrings)} if activeTouchesCount < 2 {
self.sendComboButtonsDownEvent(comboStrings: self.comboButtonStrings)
}
}
case "DPAD", "WASDPAD", "ARROWPAD": case "DPAD", "WASDPAD", "ARROWPAD":
if activeTouchesCount == 1 { if activeTouchesCount == 1 {
// showLrudBall(at: touchBeganLocation) // showLrudBall(at: touchBeganLocation)