Merge branch 'felfert-switch-lights'

Author: Sapd

.gitignore

@@ -0,0 +1 @@
+build

README.md

@@ -18,7 +18,7 @@ talking. This differs from a simple loopback via PulseAudio as you won't have an
 
 ### Other Features
 
-Corsair Void (Pro) also supports checking of the battery.
+Corsair Void (Pro) also supports checking of the battery and switching LED off/on
 
 For more features (like getting battery percentage of other devices, or settings LEDs etc. of specific devices), the protocol of the respective headset must be analyzed further. This can be done by capturing the USB traffic and analyzing it with WireShark or USBlyzer.
 
@@ -84,6 +84,8 @@ Following options don't work on all devices yet:
 
 `HeadsetControl -n 0|1` sends a notification sound, made by the headset. 0 or 1 are currently supported as values.
 
+`HeadsetControl -l 0|1` switches LED off/on (off almost doubles battery lifetime!).
+
 ## Notice
 
 HeadsetControl is distributed in the hope that it will be useful,\

src/device.h

@@ -13,7 +13,8 @@
 enum capabilities {
     CAP_SIDETONE            = 1,
     CAP_BATTERY_STATUS      = 2,
-    CAP_NOTIFICATION_SOUND  = 3
+    CAP_NOTIFICATION_SOUND  = 4,
+    CAP_LIGHTS              = 8,
 };
 
 /** @brief Flags for battery status
@@ -54,5 +55,7 @@ struct device
     int (*request_battery)(hid_device *hid_device);
 
     int (*notifcation_sound)(hid_device *hid_device, uint8_t soundid);
+
+    int (*switch_lights)(hid_device *hid_device, uint8_t on);
 };
 

src/devices/corsair_void.c

@@ -10,6 +10,7 @@ static struct device device_void;
 static int void_send_sidetone(hid_device *device_handle, uint8_t num);
 static int void_request_battery(hid_device *device_handle);
 static int void_notification_sound(hid_device *hid_device, uint8_t soundid);
+static int void_lights(hid_device *device_handle, uint8_t on);
 
 void void_init(struct device** device)
 {
@@ -18,10 +19,11 @@ void void_init(struct device** device)
 
     strcpy(device_void.device_name, "Corsair Void");
 
-    device_void.capabilities = CAP_SIDETONE | CAP_BATTERY_STATUS | CAP_NOTIFICATION_SOUND;
+    device_void.capabilities = CAP_SIDETONE | CAP_BATTERY_STATUS | CAP_NOTIFICATION_SOUND | CAP_LIGHTS;
     device_void.send_sidetone = &void_send_sidetone;
     device_void.request_battery = &void_request_battery;
     device_void.notifcation_sound = &void_notification_sound;
+    device_void.switch_lights = &void_lights;
 
     *device = &device_void;
 }
@@ -75,3 +77,9 @@ static int void_notification_sound(hid_device* device_handle, uint8_t soundid)
 
     return hid_write(device_handle, data, 3);
 }
+
+static int void_lights(hid_device* device_handle, uint8_t on)
+{
+    unsigned char data[3] = {0xC8, on ? 0x00 : 0x01, 0x00};
+    return hid_write(device_handle, data, 3);
+}

src/devices/corsair_voidpro.c

@@ -13,6 +13,7 @@ static struct device device_voidpro;
 static int voidpro_send_sidetone(hid_device *device_handle, uint8_t num);
 static int voidpro_request_battery(hid_device *device_handle);
 static int voidpro_notification_sound(hid_device *hid_device, uint8_t soundid);
+static int voidpro_lights(hid_device* device_handle, uint8_t on);
 
 void voidpro_init(struct device** device)
 {
@@ -21,10 +22,11 @@ void voidpro_init(struct device** device)
 
     strcpy(device_voidpro.device_name, "Corsair Void Pro");
 
-    device_voidpro.capabilities = CAP_SIDETONE | CAP_BATTERY_STATUS | CAP_NOTIFICATION_SOUND;
+    device_voidpro.capabilities = CAP_SIDETONE | CAP_BATTERY_STATUS | CAP_NOTIFICATION_SOUND | CAP_LIGHTS;
     device_voidpro.send_sidetone = &voidpro_send_sidetone;
     device_voidpro.request_battery = &voidpro_request_battery;
     device_voidpro.notifcation_sound = &voidpro_notification_sound;
+    device_voidpro.switch_lights = &voidpro_lights;
 
     *device = &device_voidpro;
 }
@@ -90,3 +92,9 @@ static int voidpro_notification_sound(hid_device* device_handle, uint8_t soundid
 
     return hid_write(device_handle, data, 3);
 }
+
+static int voidpro_lights(hid_device* device_handle, uint8_t on)
+{
+    unsigned char data[3] = {0xC8, on ? 0x00 : 0x01, 0x00};
+    return hid_write(device_handle, data, 3);
+}

src/devices/corsair_voidpro_wireless.c

@@ -13,6 +13,7 @@ static struct device device_voidpro_wireless;
 static int voidpro_wireless_send_sidetone(hid_device *device_handle, uint8_t num);
 static int voidpro_wireless_request_battery(hid_device *device_handle);
 static int voidpro_wireless_notification_sound(hid_device *hid_device, uint8_t soundid);
+static int voidpro_wireless_lights(hid_device* device_handle, uint8_t on);
 
 void voidpro_wireless_init(struct device** device)
 {
@@ -21,10 +22,11 @@ void voidpro_wireless_init(struct device** device)
 
     strcpy(device_voidpro_wireless.device_name, "Corsair Void Pro Wireless");
 
-    device_voidpro_wireless.capabilities = CAP_SIDETONE | CAP_BATTERY_STATUS | CAP_NOTIFICATION_SOUND;
+    device_voidpro_wireless.capabilities = CAP_SIDETONE | CAP_BATTERY_STATUS | CAP_NOTIFICATION_SOUND | CAP_LIGHTS;
     device_voidpro_wireless.send_sidetone = &voidpro_wireless_send_sidetone;
     device_voidpro_wireless.request_battery = &voidpro_wireless_request_battery;
     device_voidpro_wireless.notifcation_sound = &voidpro_wireless_notification_sound;
+    device_voidpro_wireless.switch_lights = &voidpro_wireless_lights;
 
     *device = &device_voidpro_wireless;
 }
@@ -90,3 +92,9 @@ static int voidpro_wireless_notification_sound(hid_device* device_handle, uint8_
 
     return hid_write(device_handle, data, 3);
 }
+
+static int voidpro_wireless_lights(hid_device* device_handle, uint8_t on)
+{
+    unsigned char data[3] = {0xC8, on ? 0x00 : 0x01, 0x00};
+    return hid_write(device_handle, data, 3);
+}

src/main.c

@@ -153,9 +153,10 @@ int main(int argc, char *argv[])
     int sidetone_loudness = -1;
     int request_battery = 0;
     int notification_sound = -1;
+    int lights = -1;
 
 
-    while ((c = getopt(argc, argv, "bchs:n:")) != -1)
+    while ((c = getopt(argc, argv, "bchs:n:l:")) != -1)
     {
         switch(c) {
             case 'b':
@@ -182,12 +183,21 @@ int main(int argc, char *argv[])
             case 'c':
                 short_output = 1;
                 break;
+            case 'l':
+                lights = strtol(optarg, NULL, 10);
+                if (lights < 0 || lights > 1)
+                {
+                    printf("Usage: %s -l 0|1\n", argv[0]);
+                    return 1;
+                }
+                break;
             case 'h':
                 printf("Headsetcontrol written by Sapd (Denis Arnst)\n\thttps://github.com/Sapd\n\n");
                 printf("Parameters\n");
                 printf("  -s level\tSets sidetone, level must be between 0 and 128\n");
                 printf("  -b\t\tChecks the battery level\n");
                 printf("  -n soundid\tMakes the headset play a notifiation\n");
+                printf("  -l 0|1\tSwitch lights (0 = off, 1 = on)\n");
                 printf("  -c\t\tCut unnecessary output \n");
 
                 printf("\n");
@@ -262,6 +272,28 @@ int main(int argc, char *argv[])
         }
     }
 
+    if (lights != -1)
+    {
+        if ((device_found.capabilities & CAP_LIGHTS) == 0)
+        {
+            PRINT("Error: This headset doesn't support light switching\n");
+            terminate_hid(&device_handle, &hid_path);
+            return 1;
+        }
+        ret = device_found.switch_lights(device_handle, lights);
+
+        if (ret < 0)
+        {
+            PRINT("Failed to switch lights. Error: %d: %ls\n", ret, hid_error(device_handle));
+            terminate_hid(&device_handle, &hid_path);
+            return 1;
+        }
+        else
+        {
+            PRINT("Success!\n");
+        }
+    }
+
     if (notification_sound != -1)
     {
         if ((device_found.capabilities & CAP_NOTIFICATION_SOUND) == 0)