macOS: Add support for Bluetooth devices

Release_Notes.md

@@ -1,5 +1,9 @@
 # Notes on Major Changes in Releases
 
+## Version 1.1.15
+
+* Solaar supports configuration of Bluetooth devices on macOS.
+
 ## Version 1.1.13
 
 * Solaar will drop support for Python 3.7 immediately after version 1.1.13.

lib/hidapi/hidapi_impl.py

@@ -181,15 +181,8 @@ def _enumerate_devices():
         p = p.contents.next
     _hidapi.hid_free_enumeration(c_devices)
 
-    keyboard_or_mouse = {d["path"] for d in devices if d["usage_page"] == 1 and d["usage"] in (6, 2)}
     unique_devices = {}
     for device in devices:
-        # On macOS we cannot access keyboard or mouse devices without special permissions. Since
-        # we don't need them anyway we remove them so opening them doesn't cause errors later.
-        if device["path"] in keyboard_or_mouse:
-            # print(f"Ignoring keyboard or mouse device: {device}")
-            continue
-
         # hidapi returns separate entries for each usage page of a device.
         # Deduplicate by path to only keep one device entry.
         if device["path"] not in unique_devices:
@@ -255,15 +248,20 @@ def _match(
     device_handle = None
     try:
         device_handle = open_path(device["path"])
-        report = _get_input_report(device_handle, 0x10, 32)
-        if len(report) == 1 + 6 and report[0] == 0x10:
-            device["hidpp_short"] = True
-        report = _get_input_report(device_handle, 0x11, 32)
-        if len(report) == 1 + 19 and report[0] == 0x11:
-            device["hidpp_long"] = True
-    except HIDError as e:  # noqa: F841
-        if logger.isEnabledFor(logging.INFO):
-            logger.info(f"Error opening device {device['path']} ({bus_id}/{vid:04X}/{pid:04X}) for hidpp check: {e}")  # noqa
+        try:
+            report = _get_input_report(device_handle, 0x10, 32)
+            if len(report) == 1 + 6 and report[0] == 0x10:
+                device["hidpp_short"] = True
+        except HIDError as e:
+            if logger.isEnabledFor(logging.INFO):
+                logger.info(f"Error opening device {device['path']} ({bus_id}/{vid:04X}/{pid:04X}) for hidpp check: {e}")
+        try:
+            report = _get_input_report(device_handle, 0x11, 32)
+            if len(report) == 1 + 19 and report[0] == 0x11:
+                device["hidpp_long"] = True
+        except HIDError as e:
+            if logger.isEnabledFor(logging.INFO):
+                logger.info(f"Error opening device {device['path']} ({bus_id}/{vid:04X}/{pid:04X}) for hidpp check: {e}")
     finally:
         if device_handle:
             close(device_handle)

lib/logitech_receiver/diversion.py

@@ -366,7 +366,7 @@ def simulate_uinput(what, code, arg):
 def simulate_key(code, event):  # X11 keycode but Solaar event code
     if not wayland and simulate_xtest(code, event):
         return True
-    if simulate_uinput(evdev.ecodes.EV_KEY, code - 8, event):
+    if evdev and simulate_uinput(evdev.ecodes.EV_KEY, code - 8, event):
         return True
     logger.warning("no way to simulate key input")
 

lib/solaar/cli/show.py

@@ -151,8 +151,8 @@ def _print_device(dev, num=None):
             if isinstance(feature, str):
                 feature_bytes = bytes.fromhex(feature[-4:])
             else:
-                feature_bytes = feature.to_bytes(2, byteorder="big")
-            feature_int = int.from_bytes(feature_bytes, byteorder="big")
+                feature_bytes = feature.to_bytes(2, byteorder="little")
+            feature_int = int.from_bytes(feature_bytes, byteorder="little")
             flags = dev.request(0x0000, feature_bytes)
             flags = 0 if flags is None else ord(flags[1:2])
             flags = common.flag_names(hidpp20_constants.FeatureFlag, flags)

lib/solaar/gtk.py

@@ -178,7 +178,8 @@ def main():
 
     udev_file = "42-logitech-unify-permissions.rules"
     if (
-        logger.isEnabledFor(logging.WARNING)
+        platform.system() == "Linux"
+        and logger.isEnabledFor(logging.WARNING)
         and not os.path.isfile("/etc/udev/rules.d/" + udev_file)
         and not os.path.isfile("/usr/lib/udev/rules.d/" + udev_file)
         and not os.path.isfile("/usr/local/lib/udev/rules.d/" + udev_file)