storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update evdevDriver.py

Browse Source
This commit is contained in:
chrys87 2017-02-28 16:48:52 +01:00 committed by GitHub
parent 35fba1495a
commit 739469c20f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fenrir/inputDriver/evdevDriver.py
View File

@ -106,6 +106,7 @@ class driver():
iDevicesFiles.append(self.iDevices[device].fn) iDevicesFiles.append(self.iDevices[device].fn)
if len(iDevicesFiles) == len(deviceFileList): if len(iDevicesFiles) == len(deviceFileList):
return return
eventType = evdev.events
for deviceFile in deviceFileList: for deviceFile in deviceFileList:
try: try:
if deviceFile in iDevicesFiles: if deviceFile in iDevicesFiles:
@ -123,11 +124,11 @@ class driver():
continue continue
cap = currDevice.capabilities() cap = currDevice.capabilities()
if mode in ['ALL','NOMICE']: if mode in ['ALL','NOMICE']:
if 1 in cap: if eventType.EV_KEY in cap:
if 116 in cap[1] and len(cap[1]) < 10: if 116 in cap[eventType.EV_KEY] and len(cap[eventType.EV_KEY]) < 10:
print('power') print('power')
continue continue
if len(cap[1]) < 30: if len(cap[eventType.EV_KEY]) < 30:
print('Not A useful keyboared') print('Not A useful keyboared')
continue continue
if mode == 'ALL': if mode == 'ALL':
@ -135,7 +136,7 @@ class driver():
self.grabDevice(currDevice.fd) self.grabDevice(currDevice.fd)
print('Device added (ALL):' + self.iDevices[currDevice.fd].name) print('Device added (ALL):' + self.iDevices[currDevice.fd].name)
elif mode == 'NOMICE': elif mode == 'NOMICE':
if not ((2 in cap) or (3 in cap)): if not ((eventType.EV_REL in cap) or (eventType.EV_ABS in cap)):
self.iDevices[currDevice.fd] = currDevice self.iDevices[currDevice.fd] = currDevice
self.grabDevice(currDevice.fd) self.grabDevice(currDevice.fd)
print('Device added (NOMICE):' + self.iDevices[currDevice.fd].name) print('Device added (NOMICE):' + self.iDevices[currDevice.fd].name)