SteelSeries Arctis 1 Wireless battery status support (#156)

* SteelSeries Arctis 1: battery support

Battery requesting code from  SteelSeries Arctis 1 Wireless for XBOX
works just fine for my SteelSeries Arctis 1 Wireless.

* Merge SteelSeries Arctis 1 drivers

Now SteelSeries Arctis 1 and SteelSeries Arctis 1 for XBox
differ only in function naming and device IDs, there is no
reason to keep two separate drivers for these two devices.

Author: iv-m

README.md

@@ -21,9 +21,7 @@ talking. This differs from a simple loopback via PulseAudio as you won't have an
   - Sidetone, Battery (for Wireless), LED on/off
 - Logitech G930
   - Sidetone, Battery
-- SteelSeries Arctis 1
-  - Sidetone, Inactive time
-- SteelSeries Arctis 1 for XBox
+- SteelSeries Arctis 1, Arctis 1 for XBox
   - Sidetone, Battery, Inactive time
 - SteelSeries Arctis (7 and Pro)
   - Sidetone, Battery, Inactive time, Chat-Mix level, LED on/off (allows to turn off the blinking LED on the base-station)

src/device_registry.c

@@ -10,13 +10,12 @@
 #include "devices/logitech_zone_wired.h"
 #include "devices/roccat_elo_7_1_air.h"
 #include "devices/steelseries_arctis_1.h"
-#include "devices/steelseries_arctis_1_xbox.h"
 #include "devices/steelseries_arctis_7.h"
 #include "devices/steelseries_arctis_9.h"
 
 #include <string.h>
 
-#define NUMDEVICES 13
+#define NUMDEVICES 12
 
 // array of pointers to device
 static struct device*(devicelist[NUMDEVICES]);
@@ -32,10 +31,9 @@ void init_devices()
     arctis_7_init(&devicelist[6]);
     arctis_9_init(&devicelist[7]);
     gpro_init(&devicelist[8]);
-    arctis_1_xbox_init(&devicelist[9]);
-    zone_wired_init(&devicelist[10]);
-    elo71Air_init(&devicelist[11]);
-    g432_init(&devicelist[12]);
+    zone_wired_init(&devicelist[9]);
+    elo71Air_init(&devicelist[10]);
+    g432_init(&devicelist[11]);
 }
 
 int get_device(struct device* device_found, uint16_t idVendor, uint16_t idProduct)

src/devices/CMakeLists.txt

@@ -11,8 +11,6 @@ set(SOURCE_FILES ${SOURCE_FILES}
     ${CMAKE_CURRENT_SOURCE_DIR}/logitech_g533.h
     ${CMAKE_CURRENT_SOURCE_DIR}/steelseries_arctis_1.c
     ${CMAKE_CURRENT_SOURCE_DIR}/steelseries_arctis_1.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/steelseries_arctis_1_xbox.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/steelseries_arctis_1_xbox.h
     ${CMAKE_CURRENT_SOURCE_DIR}/steelseries_arctis_7.c
     ${CMAKE_CURRENT_SOURCE_DIR}/steelseries_arctis_7.h
     ${CMAKE_CURRENT_SOURCE_DIR}/steelseries_arctis_9.c

src/devices/steelseries_arctis_1.c

@@ -9,12 +9,13 @@
 
 static struct device device_arctis;
 
-#define ID_ARCTIS_1 0x12b3
+#define ID_ARCTIS_1      0x12b3
+#define ID_ARCTIS_1_XBOX 0x12b6
 
-static const uint16_t PRODUCT_IDS[] = { ID_ARCTIS_1 };
+static const uint16_t PRODUCT_IDS[] = { ID_ARCTIS_1, ID_ARCTIS_1_XBOX };
 
 static int arctis_1_send_sidetone(hid_device* device_handle, uint8_t num);
-//static int arctis_1_request_battery(hid_device* device_handle);
+static int arctis_1_request_battery(hid_device* device_handle);
 static int arctis_1_send_inactive_time(hid_device* device_handle, uint8_t num);
 
 static int arctis_1_save_state(hid_device* device_handle);
@@ -28,9 +29,9 @@ void arctis_1_init(struct device** device)
 
     strncpy(device_arctis.device_name, "SteelSeries Arctis (1) Wireless", sizeof(device_arctis.device_name));
 
-    device_arctis.capabilities = CAP_SIDETONE | CAP_INACTIVE_TIME;
+    device_arctis.capabilities = CAP_SIDETONE | CAP_BATTERY_STATUS | CAP_INACTIVE_TIME;
     device_arctis.send_sidetone = &arctis_1_send_sidetone;
-    //device_arctis.request_battery = &arctis_1_request_battery;
+    device_arctis.request_battery = &arctis_1_request_battery;
     device_arctis.send_inactive_time = &arctis_1_send_inactive_time;
 
     *device = &device_arctis;
@@ -69,13 +70,12 @@ static int arctis_1_send_sidetone(hid_device* device_handle, uint8_t num)
     return ret;
 }
 
-/*static int arctis_1_request_battery(hid_device* device_handle)
+static int arctis_1_request_battery(hid_device* device_handle)
 {
-
     int r = 0;
 
     // request battery status
-    unsigned char data_request[2] = { 0x06, 0x18 };
+    unsigned char data_request[2] = { 0x06, 0x12 };
 
     r = hid_write(device_handle, data_request, 2);
 
@@ -90,13 +90,16 @@ static int arctis_1_send_sidetone(hid_device* device_handle, uint8_t num)
     if (r < 0)
         return r;
 
-    int bat = data_read[2];
+    if (data_read[2] == 0x01)
+        return BATTERY_UNAVAILABLE;
+
+    int bat = data_read[3];
 
     if (bat > 100)
         return 100;
 
     return bat;
-}*/
+}
 
 static int arctis_1_send_inactive_time(hid_device* device_handle, uint8_t num)
 {