RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

device: align init methods for all receiver classes

This commit is contained in:
Peter F. Patel-Schneider 2024-03-16 08:28:29 -04:00
parent e0047024a5
commit 480badbe8c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/logitech_receiver/receiver.py
View File

@ -363,8 +363,8 @@ class Receiver:
class BoltReceiver(Receiver): class BoltReceiver(Receiver):
"""Bolt receivers use a different pairing prototol and have different pairing registers""" """Bolt receivers use a different pairing prototol and have different pairing registers"""
def __init__(self, product_info, handle, path, product_id, setting_callback=None): def __init__(self, receiver_kind, product_info, handle, path, product_id, setting_callback=None):
super().__init__("bolt", product_info, handle, path, product_id, setting_callback) super().__init__(receiver_kind, product_info, handle, path, product_id, setting_callback)
def initialize(self, product_info: dict): def initialize(self, product_info: dict):
serial_reply = self.read_register(_R.bolt_uniqueId) serial_reply = self.read_register(_R.bolt_uniqueId)
@ -411,25 +411,25 @@ class BoltReceiver(Receiver):
class UnifyingReceiver(Receiver): class UnifyingReceiver(Receiver):
def __init__(self, product_info, handle, path, product_id, setting_callback=None): def __init__(self, receiver_kind, product_info, handle, path, product_id, setting_callback=None):
super().__init__("unifying", product_info, handle, path, product_id, setting_callback) super().__init__(receiver_kind, product_info, handle, path, product_id, setting_callback)
class NanoReceiver(Receiver): class NanoReceiver(Receiver):
def __init__(self, product_info, handle, path, product_id, setting_callback=None): def __init__(self, receiver_kind, product_info, handle, path, product_id, setting_callback=None):
super().__init__("nano", product_info, handle, path, product_id, setting_callback) super().__init__(receiver_kind, product_info, handle, path, product_id, setting_callback)
class LightSpeedReceiver(Receiver): class LightSpeedReceiver(Receiver):
def __init__(self, product_info, handle, path, product_id, setting_callback=None): def __init__(self, receiver_kind, product_info, handle, path, product_id, setting_callback=None):
super().__init__("lightspeed", product_info, handle, path, product_id, setting_callback) super().__init__(receiver_kind, product_info, handle, path, product_id, setting_callback)
class Ex100Receiver(Receiver): class Ex100Receiver(Receiver):
"""A very old style receiver, somewhat different from newer receivers""" """A very old style receiver, somewhat different from newer receivers"""
def __init__(self, product_info, handle, path, product_id, setting_callback=None): def __init__(self, receiver_kind, product_info, handle, path, product_id, setting_callback=None):
super().__init__("27Mhz", product_info, handle, path, product_id, setting_callback) super().__init__(receiver_kind, product_info, handle, path, product_id, setting_callback)
def initialize(self, product_info: dict): def initialize(self, product_info: dict):
self.serial = None self.serial = None
@ -491,9 +491,9 @@ class ReceiverFactory:
if not product_info: if not product_info:
logger.warning("Unknown receiver type: %s", device_info.product_id) logger.warning("Unknown receiver type: %s", device_info.product_id)
product_info = {} product_info = {}
receiver_kind = product_info.get("receiver_kind", "unknown") kind = product_info.get("receiver_kind", "unknown")
receiver_class = receiver_class_mapping.get(receiver_kind, Receiver) rclass = receiver_class_mapping.get(kind, Receiver)
return receiver_class(product_info, handle, device_info.path, device_info.product_id, setting_callback) return rclass(kind, product_info, handle, device_info.path, device_info.product_id, setting_callback)
except OSError as e: except OSError as e:
logger.exception("open %s", device_info) logger.exception("open %s", device_info)
if e.errno == _errno.EACCES: if e.errno == _errno.EACCES: