moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-04-05 23:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add rumble support for the in-app Xbox driver

Browse Source
This commit is contained in:
Cameron Gutman
2019-02-16 17:03:10 -08:00
parent 6a939e7495
commit a22e33eeb9
8 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/limelight/binding/input/driver/AbstractController.java
View File

@@ -37,11 +37,13 @@ public abstract class AbstractController {
this.listener = listener;
}
public abstract void rumble(short lowFreqMotor, short highFreqMotor);
protected void notifyDeviceRemoved() {
listener.deviceRemoved(deviceId);
listener.deviceRemoved(this);
}
protected void notifyDeviceAdded() {
listener.deviceAdded(deviceId);
listener.deviceAdded(this);
}
}

4
app/src/main/java/com/limelight/binding/input/driver/UsbDriverListener.java
View File

@@ -6,6 +6,6 @@ public interface UsbDriverListener {
float rightStickX, float rightStickY,
float leftTrigger, float rightTrigger);
void deviceRemoved(int controllerId);
void deviceAdded(int controllerId);
void deviceRemoved(AbstractController controller);
void deviceAdded(AbstractController controller);
}

17
app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
View File

@@ -47,26 +47,21 @@ public class UsbDriverService extends Service implements UsbDriverListener {
}
@Override
public void deviceRemoved(int controllerId) {
public void deviceRemoved(AbstractController controller) {
// Remove the the controller from our list (if not removed already)
for (AbstractController controller : controllers) {
if (controller.getControllerId() == controllerId) {
controllers.remove(controller);
break;
}
}
controllers.remove(controller);
// Call through to the client's listener
if (listener != null) {
listener.deviceRemoved(controllerId);
listener.deviceRemoved(controller);
}
}
@Override
public void deviceAdded(int controllerId) {
public void deviceAdded(AbstractController controller) {
// Call through to the client's listener
if (listener != null) {
listener.deviceAdded(controllerId);
listener.deviceAdded(controller);
}
}
@@ -113,7 +108,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
// Report all controllerMap that already exist
if (listener != null) {
for (AbstractController controller : controllers) {
listener.deviceAdded(controller.getControllerId());
listener.deviceAdded(controller);
}
}
}

13
app/src/main/java/com/limelight/binding/input/driver/Xbox360Controller.java
View File

@@ -139,4 +139,17 @@ public class Xbox360Controller extends AbstractXboxController {
// No need to fail init if the LED command fails
return true;
}
@Override
public void rumble(short lowFreqMotor, short highFreqMotor) {
byte[] data = {
0x00, 0x08, 0x00,
(byte)(lowFreqMotor >> 8), (byte)(highFreqMotor >> 8),
0x00, 0x00, 0x00
};
int res = connection.bulkTransfer(outEndpt, data, data.length, 100);
if (res != data.length) {
LimeLog.warning("Rumble transfer failed: "+res);
}
}
}

17
app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java
View File

@@ -48,6 +48,7 @@ public class XboxOneController extends AbstractXboxController {
new InitPacket(0x24c6, 0x543a, RUMBLE_INIT2),
};
private byte seqNum = 0;
public XboxOneController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
super(device, connection, deviceId, listener);
@@ -134,8 +135,6 @@ public class XboxOneController extends AbstractXboxController {
@Override
protected boolean doInit() {
byte seqNum = 0;
// Send all applicable init packets
for (InitPacket pkt : INIT_PKTS) {
if (pkt.vendorId != 0 && device.getVendorId() != pkt.vendorId) {
@@ -162,6 +161,20 @@ public class XboxOneController extends AbstractXboxController {
return true;
}
@Override
public void rumble(short lowFreqMotor, short highFreqMotor) {
byte[] data = {
0x09, 0x00, seqNum++, 0x09, 0x00,
0x0F, 0x00, 0x00,
(byte)(lowFreqMotor >> 9), (byte)(highFreqMotor >> 9),
(byte)0xFF, 0x00, (byte)0xFF
};
int res = connection.bulkTransfer(outEndpt, data, data.length, 100);
if (res != data.length) {
LimeLog.warning("Rumble transfer failed: "+res);
}
}
private static class InitPacket {
final int vendorId;
final int productId;