djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

better controller hid identification - should fix the 50/50 controller not found

Browse Source
This commit is contained in:
isXander
2023-04-05 23:54:10 +01:00
parent ca56271c6e
commit 3b1566cdc1
4 changed files with 113 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/main/java/dev/isxander/controlify/controller/hid/ControllerHIDService.java
View File

@ -3,28 +3,34 @@ package dev.isxander.controlify.controller.hid;
import dev.isxander.controlify.Controlify;
import dev.isxander.controlify.controller.ControllerType;
import org.hid4java.*;
import org.hid4java.event.HidServicesEvent;
import java.util.*;
import java.util.concurrent.ArrayBlockingQueue;
public class ControllerHIDService implements HidServicesListener {
public class ControllerHIDService {
private final HidServicesSpecification specification;
private HidServices services;
private final Map<String, HIDIdentifier> unconsumedHIDs;
private final Queue<HIDIdentifierWithPath> unconsumedControllerHIDs;
private final Map<String, HidDevice> attachedDevices = new HashMap<>();
private boolean disabled = false;
// https://learn.microsoft.com/en-us/windows-hardware/drivers/hid/hid-usages#usage-page
private static final Set<Integer> CONTROLLER_USAGE_IDS = Set.of(
0x04, // Joystick
0x05, // Gamepad
0x08 // Multi-axis Controller
);
public ControllerHIDService() {
this.specification = new HidServicesSpecification();
specification.setAutoStart(false);
this.unconsumedHIDs = new LinkedHashMap<>();
specification.setScanMode(ScanMode.NO_SCAN);
this.unconsumedControllerHIDs = new ArrayBlockingQueue<>(50);
}
public void start() {
try {
services = HidManager.getHidServices(specification);
services.addHidServicesListener(this);
services.start();
} catch (HidException e) {
Controlify.LOGGER.error("Failed to start controller HID service! If you are on Linux using flatpak or snap, this is likely because your launcher has not added libusb to their package.", e);
@ -33,48 +39,74 @@ public class ControllerHIDService implements HidServicesListener {
}
public ControllerHIDInfo fetchType() {
services.scan();
try {
// wait for scan to complete on separate thread
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
doScanOnThisThread();
HIDIdentifierWithPath hid = unconsumedControllerHIDs.poll();
if (hid == null) {
Controlify.LOGGER.warn("No controller found via USB hardware scan! This prevents identifying controller type.");
return new ControllerHIDInfo(ControllerType.UNKNOWN, Optional.empty());
}
var typeMap = ControllerType.getTypeMap();
for (var entry : unconsumedHIDs.entrySet()) {
var path = entry.getKey();
var hid = entry.getValue();
var type = typeMap.get(hid);
if (type != null) {
Controlify.LOGGER.info("identified controller type " + type);
unconsumedHIDs.remove(path);
return new ControllerHIDInfo(type, Optional.of(path));
}
}
ControllerType type = ControllerType.getTypeMap().getOrDefault(hid.identifier(), ControllerType.UNKNOWN);
if (type == ControllerType.UNKNOWN)
Controlify.LOGGER.warn("Controller found via USB hardware scan, but it was not found in the controller identification database! (HID: {})", hid.identifier());
Controlify.LOGGER.warn("Controller type unknown! Please report the make and model of your controller and give the following details: " + unconsumedHIDs);
return new ControllerHIDInfo(ControllerType.UNKNOWN, Optional.empty());
}
unconsumedControllerHIDs.removeIf(h -> hid.path().equals(h.path()));
@Override
public void hidDeviceAttached(HidServicesEvent event) {
var device = event.getHidDevice();
unconsumedHIDs.put(device.getPath(), new HIDIdentifier(device.getVendorId(), device.getProductId()));
return new ControllerHIDInfo(type, Optional.of(hid.path()));
}
public boolean isDisabled() {
return disabled;
}
@Override
public void hidDeviceDetached(HidServicesEvent event) {
unconsumedHIDs.remove(event.getHidDevice().getPath());
private void doScanOnThisThread() {
List<String> removeList = new ArrayList<String>();
List<HidDevice> attachedHidDeviceList = services.getAttachedHidDevices();
for (HidDevice attachedDevice : attachedHidDeviceList) {
if (!this.attachedDevices.containsKey(attachedDevice.getId())) {
// Device has become attached so add it but do not open
attachedDevices.put(attachedDevice.getId(), attachedDevice);
// add an unconsumed identifier that can be removed if not disconnected
HIDIdentifier identifier = new HIDIdentifier(attachedDevice.getVendorId(), attachedDevice.getProductId());
if (isController(attachedDevice))
unconsumedControllerHIDs.add(new HIDIdentifierWithPath(attachedDevice.getPath(), identifier));
}
}
for (Map.Entry<String, HidDevice> entry : attachedDevices.entrySet()) {
String deviceId = entry.getKey();
HidDevice hidDevice = entry.getValue();
if (!attachedHidDeviceList.contains(hidDevice)) {
// Keep track of removals
removeList.add(deviceId);
// remove device from unconsumed list
unconsumedControllerHIDs.removeIf(device -> this.attachedDevices.get(deviceId).getPath().equals(device.path()));
}
}
if (!removeList.isEmpty()) {
// Update the attached devices map
removeList.forEach(this.attachedDevices.keySet()::remove);
}
}
@Override
public void hidFailure(HidServicesEvent event) {
private boolean isController(HidDevice device) {
boolean isControllerType = ControllerType.getTypeMap().containsKey(new HIDIdentifier(device.getVendorId(), device.getProductId()));
boolean isGenericDesktopControlOrGameControl = device.getUsagePage() == 0x1 || device.getUsagePage() == 0x5;
boolean isSelfIdentifiedController = CONTROLLER_USAGE_IDS.contains(device.getUsage());
return ControllerType.getTypeMap().containsKey(new HIDIdentifier(device.getVendorId(), device.getProductId()))
|| (isGenericDesktopControlOrGameControl && isSelfIdentifiedController);
}
public record ControllerHIDInfo(ControllerType type, Optional<String> path) {
@ -82,4 +114,7 @@ public class ControllerHIDService implements HidServicesListener {
return path.map(p -> UUID.nameUUIDFromBytes(p.getBytes())).map(UUID::toString);
}
}
private record HIDIdentifierWithPath(String path, HIDIdentifier identifier) {
}
}