muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Omiting information that is per-device from the data used to generate a gamepad's signature.

Browse Source
This commit is contained in:
David Carley
2022-08-31 17:31:10 +00:00
parent ed1e4e6511
commit 64a33a7e40
3 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "bbctrl",
"version": "1.0.10b11",
"version": "1.0.10b12",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "bbctrl",
"version": "1.0.10b11",
"version": "1.0.10b12",
"hasInstallScript": true,
"license": "GPL-3.0+",
"dependencies": {

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "bbctrl",
"version": "1.0.10b11",
"version": "1.0.10b12",
"homepage": "https://onefinitycnc.com/",
"repository": "https://github.com/OneFinityCNC/onefinity",
"license": "GPL-3.0+",

39
src/py/bbctrl/Jog.py
View File

@@ -21,7 +21,7 @@ gamepadConfigs = {
"sign-z": -1,
"deadband": 0.15
},
"5C936FF2": {
"9E2B3A63": {
"description": "Logitech 710, X mode",
"EV_KEY:308": "speed-4",
"EV_KEY:305": "speed-3",
@@ -35,7 +35,7 @@ gamepadConfigs = {
"EV_KEY:310": "lock-y",
"EV_KEY:311": "lock-x",
},
"10E159EC": {
"B98EF4EC": {
"description": "Logitech 710, D mode",
"EV_KEY:307": "speed-4",
"EV_KEY:306": "speed-3",
@@ -49,7 +49,7 @@ gamepadConfigs = {
"EV_KEY:308": "lock-y",
"EV_KEY:309": "lock-x",
},
"5443E73C": {
"268256FD": {
"description": "EasySMX ESM-9013, top lights mode",
"EV_KEY:308": "speed-4",
"EV_KEY:305": "speed-3",
@@ -63,7 +63,7 @@ gamepadConfigs = {
"EV_KEY:310": "lock-y",
"EV_KEY:311": "lock-x",
},
"951CA031": {
"23CEC0CB": {
"description": "EasySMX ESM-9013, left lights mode",
"EV_KEY:304": "speed-4",
"EV_KEY:305": "speed-3",
@@ -77,7 +77,7 @@ gamepadConfigs = {
"EV_KEY:308": "lock-y",
"EV_KEY:309": "lock-x",
},
"0BF75ED2": {
"370DCB72": {
"description": "EasySMX ESM-9013, bottom lights mode",
"EV_KEY:308": "speed-4",
"EV_KEY:305": "speed-3",
@@ -91,7 +91,7 @@ gamepadConfigs = {
"EV_KEY:310": "lock-y",
"EV_KEY:311": "lock-x",
},
"B3907139": {
"0BD0841F": {
"description": "Sony Playstation 4 Dual-Shock Controller",
"EV_KEY:307": "speed-4",
"EV_KEY:306": "speed-3",
@@ -107,17 +107,6 @@ gamepadConfigs = {
}
}
udevPropertiesToLog = ["ID_MODEL", "ID_SERIAL", "ID_SERIAL_SHORT", "ID_VENDOR"]
udevPropertiesToIgnore = [
".INPUT_CLASS", "ACTION", "DEVLINKS", "DEVNAME", "DEVPATH", "ID_BUS",
"ID_FOR_SEAT", "ID_INPUT", "ID_INPUT_JOYSTICK", "ID_MODEL_ID",
"ID_MODEL_ENC", "ID_PATH", "ID_PATH_TAG", "ID_REVISION", "ID_TYPE",
"ID_USB_DRIVER", "ID_USB_INTERFACES", "ID_USB_INTERFACE_NUM",
"ID_VENDOR_ENC", "ID_VENDOR_ID", "LIBINPUT_DEVICE_GROUP", "MAJOR", "MINOR",
"SEQNUM", "SUBSYSTEM", "TAGS", "USEC_INITIALIZED"
]
def safe_int(s, base=10, val=None):
try:
@@ -175,12 +164,11 @@ class Gamepad(object):
"version": _evdev.info.version,
"capabilities": self._capabilities,
},
"udev":
{key: get_udev_prop(_udev, key)
for key in udevPropertiesToLog}
"udev": {key: _udev.properties[key]
for key in _udev.properties}
}
json = to_sorted_json(self._details)
json = to_sorted_json(self._details["evdev"])
self.hash = hashlib.sha256(json.encode()).hexdigest()[-8:].upper()
self.config = {
@@ -308,15 +296,6 @@ class Jog(object):
for key in udev.properties})))
continue
uniqueProperties = set(udev.properties).difference(
udevPropertiesToIgnore).difference(udevPropertiesToLog)
if len(uniqueProperties) > 0:
self.log.info("Unique properties: {}".format(
to_sorted_json({
key: udev.properties[key]
for key in uniqueProperties
})))
if udev.action == 'add':
self._listen(udev.device_node)
elif udev.action == 'remove':