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

solaar: treat all DJ pairing notifications as only needing an informational message

This commit is contained in:
Peter F. Patel-Schneider 2022-04-05 08:52:18 -04:00
parent 46b9294d63
commit 7d230a1f31
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/solaar/listener.py
View File

@ -198,6 +198,12 @@ class ReceiverListener(_listener.EventsListener):
_log.debug('Notification %s via device %s being ignored.', n, self.receiver) _log.debug('Notification %s via device %s being ignored.', n, self.receiver)
return return
# DJ pairing notification - ignore - hid++ 1.0 pairing notification is all that is needed
if n.sub_id == 0x41 and n.report_id == _base.DJ_MESSAGE_ID:
if _log.isEnabledFor(_INFO):
_log.info('ignoring DJ pairing notification %s', n)
return
# a device notification # a device notification
if not (0 < n.devnumber <= self.receiver.max_devices): if not (0 < n.devnumber <= self.receiver.max_devices):
if _log.isEnabledFor(_WARNING): if _log.isEnabledFor(_WARNING):
@ -218,12 +224,7 @@ class ReceiverListener(_listener.EventsListener):
if n.sub_id == 0x40 and not already_known: if n.sub_id == 0x40 and not already_known:
return # disconnecting something that is not known - nothing to do return # disconnecting something that is not known - nothing to do
if n.sub_id == 0x41 and n.report_id == _base.DJ_MESSAGE_ID: if n.sub_id == 0x41:
# DJ pairing notification - ignore - hid++ 1.0 pairing notification is all that is needed
if _log.isEnabledFor(_INFO):
_log.info('ignoring DJ pairing notification %s', n)
return
elif n.sub_id == 0x41:
if not already_known: if not already_known:
if n.address == 0x0A and not self.receiver.receiver_kind == 'bolt': if n.address == 0x0A and not self.receiver.receiver_kind == 'bolt':
# some Nanos send a notification even if no new pairing - check that there really is a device there # some Nanos send a notification even if no new pairing - check that there really is a device there