Merge branch 'Sapd:master' into master

Sapd · Nov 25, 2024 · aa8fa59 · aa8fa59
2 parents 023861f + c96c3d9
commit aa8fa59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/devices/logitech_g633_g933_935.c b/src/devices/logitech_g633_g933_935.c
@@ -15,8 +15,9 @@ static struct device device_g933_935;
 #define ID_LOGITECH_G935   0x0a87
 #define ID_LOGITECH_G733   0x0ab5
 #define ID_LOGITECH_G733_2 0x0afe
+#define ID_LOGITECH_G733_3 0x0b1f
 
-static const uint16_t PRODUCT_IDS[] = { ID_LOGITECH_G633, ID_LOGITECH_G635, ID_LOGITECH_G933, ID_LOGITECH_G935, ID_LOGITECH_G733, ID_LOGITECH_G733_2 };
+static const uint16_t PRODUCT_IDS[] = { ID_LOGITECH_G633, ID_LOGITECH_G635, ID_LOGITECH_G933, ID_LOGITECH_G935, ID_LOGITECH_G733, ID_LOGITECH_G733_2, ID_LOGITECH_G733_3 };
 
 static int g933_935_send_sidetone(hid_device* device_handle, uint8_t num);
 static BatteryInfo g933_935_request_battery(hid_device* device_handle);

diff --git a/src/devices/steelseries_arctis_nova_pro_wireless.c b/src/devices/steelseries_arctis_nova_pro_wireless.c
@@ -6,7 +6,8 @@
 
 static struct device device_arctis;
 
-enum { ID_ARCTIS_NOVA_PRO_WIRELESS_BASE_STATION = 0x12e0 };
+enum { ID_ARCTIS_NOVA_PRO_WIRELESS_BASE_STATION = 0x12e0,
+    ID_ARCTIS_NOVA_PRO_WIRELESS_X_BASE_STATION  = 0x12e5 };
 
 enum {
     MSG_SIZE        = 31,
@@ -47,7 +48,7 @@ enum {
     EQUALIZER_BAND_MAX      = +10,
 };
 
-static const uint16_t PRODUCT_IDS[] = { ID_ARCTIS_NOVA_PRO_WIRELESS_BASE_STATION };
+static const uint16_t PRODUCT_IDS[] = { ID_ARCTIS_NOVA_PRO_WIRELESS_BASE_STATION, ID_ARCTIS_NOVA_PRO_WIRELESS_X_BASE_STATION };
 static EqualizerInfo EQUALIZER      = { EQUALIZER_BANDS_SIZE, 0, 0.5, EQUALIZER_BAND_MIN, EQUALIZER_BAND_MAX };
 
 static int set_sidetone(hid_device* device_handle, uint8_t num);