Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Logitech G Pro X 2 support #315

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ talking. This differs from a simple loopback via PulseAudio as you won't have an
- Sidetone, Battery, Inactive time
- Logitech G PRO
- Sidetone, Battery, Inactive time
- Logitech G PRO X 2
- Sidetone, Inactive time
- Logitech Zone Wired/Zone 750
- Sidetone, Voice prompts, Rotate to mute
- Roccat Elo 7.1 Air
Expand Down
4 changes: 3 additions & 1 deletion src/device_registry.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "devices/logitech_g633_g933_935.h"
#include "devices/logitech_g930.h"
#include "devices/logitech_gpro.h"
#include "devices/logitech_gpro_x2.h"
#include "devices/logitech_zone_wired.h"
#include "devices/roccat_elo_7_1_air.h"
#include "devices/roccat_elo_7_1_usb.h"
Expand All @@ -23,7 +24,7 @@

#include <string.h>

#define NUMDEVICES 20
#define NUMDEVICES 21

// array of pointers to device
static struct device*(devicelist[NUMDEVICES]);
Expand All @@ -50,6 +51,7 @@ void init_devices()
arctis_nova_7_init(&devicelist[17]);
calphaw_init(&devicelist[18]);
arctis_nova_pro_wireless_init(&devicelist[19]);
gpro_x2_init(&devicelist[20]);
}

int get_device(struct device* device_found, uint16_t idVendor, uint16_t idProduct)
Expand Down
2 changes: 2 additions & 0 deletions src/devices/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ set(SOURCE_FILES ${SOURCE_FILES}
${CMAKE_CURRENT_SOURCE_DIR}/logitech_gpro.h
${CMAKE_CURRENT_SOURCE_DIR}/logitech_zone_wired.c
${CMAKE_CURRENT_SOURCE_DIR}/logitech_zone_wired.h
${CMAKE_CURRENT_SOURCE_DIR}/logitech_gpro_x2.c
${CMAKE_CURRENT_SOURCE_DIR}/logitech_gpro_x2.h
PARENT_SCOPE)
54 changes: 54 additions & 0 deletions src/devices/logitech_gpro_x2.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#include <unistd.h>

#include <math.h>
#include <stdint.h>
#include <string.h>

#include "../device.h"
#include "../utility.h"
#include "logitech.h"

static struct device device_gpro_x2;

#define ID_LOGITECH_PRO_X2 0x0af7

static const uint16_t PRODUCT_IDS[] = {
ID_LOGITECH_PRO_X2,
};

static int gpro_x2_send_sidetone(hid_device* device_handle, uint8_t num);
static int gpro_x2_send_inactive_time(hid_device* device_handle, uint8_t num);

void gpro_x2_init(struct device** device)
{
device_gpro_x2.idVendor = VENDOR_LOGITECH;
device_gpro_x2.idProductsSupported = PRODUCT_IDS;
device_gpro_x2.numIdProducts = sizeof(PRODUCT_IDS) / sizeof(PRODUCT_IDS[0]);

strncpy(device_gpro_x2.device_name, "Logitech G PRO X 2", sizeof(device_gpro_x2.device_name));

device_gpro_x2.capabilities = B(CAP_SIDETONE) | B(CAP_INACTIVE_TIME);
device_gpro_x2.capability_details[CAP_SIDETONE] = (struct capability_detail) { .usagepage = 0xffa0, .usageid = 0x1, .interface = 3 };
device_gpro_x2.capability_details[CAP_INACTIVE_TIME] = (struct capability_detail) { .usagepage = 0xffa0, .usageid = 0x1, .interface = 3 };

device_gpro_x2.send_sidetone = &gpro_x2_send_sidetone;
device_gpro_x2.send_inactive_time = &gpro_x2_send_inactive_time;

*device = &device_gpro_x2;
}

static int gpro_x2_send_sidetone(hid_device* device_handle, uint8_t num)
{
num = map(num, 0, 128, 0, 100);

uint8_t sidetone_data[12] = { 0x51, 0x0a, 0x00, 0x03, 0x1b, 0x00, 0x05, 0x00, 0x07, 0x1b, 0x01, num };

return hid_write(device_handle, sidetone_data, sizeof(sidetone_data) / sizeof(sidetone_data[0]));
}

static int gpro_x2_send_inactive_time(hid_device* device_handle, uint8_t num)
{
uint8_t inactive_time_data[11] = { 0x51, 0x09, 0x00, 0x03, 0x1c, 0x00, 0x04, 0x00, 0x06, 0x1d, num };

return hid_write(device_handle, inactive_time_data, sizeof(inactive_time_data) / sizeof(inactive_time_data[0]));
}
3 changes: 3 additions & 0 deletions src/devices/logitech_gpro_x2.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#pragma once

void gpro_x2_init(struct device** device);
Loading