CodingPirates/pydualsense
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving winreg check to support other OSes

Browse Source
This commit is contained in:
Dan
2020-12-31 20:39:50 -05:00
parent 93b5e38e6e
commit bc0eb35c3c
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pydualsense/hidguardian.py Normal file
View File

@@ -0,0 +1,18 @@
import winreg
import sys
def check_hide(self) -> bool:
"""check if hidguardian is used and controller is hidden
"""
if sys.platform.startswith('win32'):
try:
access_reg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
access_key = winreg.OpenKey(access_reg, 'SYSTEM\CurrentControlSet\Services\HidGuardian\Parameters', 0, winreg.KEY_READ)
affected_devices = winreg.QueryValueEx(access_key, 'AffectedDevices')[0]
if "054C" in affected_devices and "0CE6" in affected_devices:
return True
return False
except OSError as e:
print(e)
return False

25
pydualsense/pydualsense.py
View File

@@ -4,7 +4,6 @@ from .enums import (LedOptions, PlayerID,
PulseOptions, TriggerModes, Brightness)
import threading
import sys
import winreg
class pydualsense:
def __init__(self, verbose: bool = False) -> None:#
@@ -43,23 +42,7 @@ class pydualsense:
self.ds_thread = False
self.report_thread.join()
self.device.close()
def _check_hide(self) -> bool:
"""check if hidguardian is used and controller is hidden
"""
if sys.platform.startswith('win32'):
try:
access_reg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
access_key = winreg.OpenKey(access_reg, 'SYSTEM\CurrentControlSet\Services\HidGuardian\Parameters', 0, winreg.KEY_READ)
affected_devices = winreg.QueryValueEx(access_key, 'AffectedDevices')[0]
if "054C" in affected_devices and "0CE6" in affected_devices:
return True
return False
except OSError as e:
print(e)
return False
def __find_device(self) -> hid.Device:
"""
@@ -74,8 +57,10 @@ class pydualsense:
"""
# TODO: detect connection mode, bluetooth has a bigger write buffer
# TODO: implement multiple controllers working
if self._check_hide():
raise Exception('HIDGuardian detected. Delete the controller from HIDGuardian and restart PC to connect to controller')
if sys.platform.startswith('win32'):
import pydualsense.hidguardian as hidguardian
if hidguardian.check_hide():
raise Exception('HIDGuardian detected. Delete the controller from HIDGuardian and restart PC to connect to controller')
detected_device: hid.Device = None
devices = hid.enumerate(vid=0x054c)
for device in devices: