Support for optical Sabre mice

Author: ccMSC

VERSION

@@ -1 +1 @@
-beta-v0.2.2+t02
+beta-v0.2.2+t03

src/ckb-daemon/usb.c

@@ -34,7 +34,7 @@ const char* product_str(short product){
         return "strafe";
     if(product == P_M65)
         return "m65";
-    if(product == P_SABRE)
+    if(product == P_SABRE_O || product == P_SABRE_L)
         return "sabre";
     if(product == P_SCIMITAR)
         return "scimitar";

src/ckb-daemon/usb.h

@@ -34,9 +34,11 @@
 #define P_M65_STR       "1b12"
 #define IS_M65(kb)      ((kb)->vendor == V_CORSAIR && ((kb)->product == P_M65))
 
-#define P_SABRE         0x1b19
-#define P_SABRE_STR     "1b19"
-#define IS_SABRE(kb)    ((kb)->vendor == V_CORSAIR && ((kb)->product == P_SABRE))
+#define P_SABRE_O       0x1b14
+#define P_SABRE_O_STR   "1b14"
+#define P_SABRE_L       0x1b19
+#define P_SABRE_L_STR   "1b19"
+#define IS_SABRE(kb)    ((kb)->vendor == V_CORSAIR && ((kb)->product == P_SABRE_O || (kb)->product == P_SABRE_L))
 
 #define P_SCIMITAR      0x1b1e
 #define P_SCIMITAR_STR  "1b1e"
@@ -57,7 +59,7 @@ const char* product_str(short product);
 #define IS_MONOCHROME(vendor, product)  ((vendor) == (V_CORSAIR) && (product) == (P_STRAFE_NRGB))
 
 // Mouse vs keyboard test
-#define IS_MOUSE(vendor, product)       ((vendor) == (V_CORSAIR) && ((product) == (P_M65) || (product) == (P_SABRE) || (product) == (P_SCIMITAR)))
+#define IS_MOUSE(vendor, product)       ((vendor) == (V_CORSAIR) && ((product) == (P_M65) || (product) == (P_SABRE_O) || (product) == (P_SABRE_L) || (product) == (P_SCIMITAR)))
 
 // USB delays for when the keyboards get picky about timing
 #define DELAY_SHORT(kb)     usleep((int)(kb)->usbdelay * 1000)  // base (default: 5ms)

src/ckb-daemon/usb_linux.c

@@ -341,7 +341,8 @@ static _model models[] = {
     { P_STRAFE_NRGB_STR, P_STRAFE_NRGB },
     // Mice
     { P_M65_STR, P_M65 },
-    { P_SABRE_STR, P_SABRE },
+    { P_SABRE_O_STR, P_SABRE_O },
+    { P_SABRE_L_STR, P_SABRE_L },
     { P_SCIMITAR_STR, P_SCIMITAR }
 };
 #define N_MODELS (sizeof(models) / sizeof(_model))

src/ckb-daemon/usb_mac.c

@@ -403,7 +403,7 @@ int usbmain(){
         // Keyboards
         P_K65, P_K70, P_K70_NRGB, P_K95, P_K95_NRGB, P_STRAFE, P_STRAFE_NRGB,
         // Mice
-        P_M65, P_SABRE, P_SCIMITAR
+        P_M65, P_SABRE_O, P_SABRE_L, P_SCIMITAR
     };
     // Tell IOService which type of devices we want (IOHIDDevices matching the supported vendor/products)
     CFMutableDictionaryRef match = IOServiceMatching(kIOHIDDeviceKey);