From 2aaf23ef1e755ef248cca421d414d311ead36a56 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 8 Apr 2021 22:29:50 -0500 Subject: [PATCH] Add detectors for all remaining devices in RazerDevices.h and rename a few things --- .../RazerController/RazerController.cpp | 8 +- .../RazerController/RazerControllerDetect.cpp | 114 ++++++--- Controllers/RazerController/RazerDevices.h | 228 +++++++++--------- 3 files changed, 196 insertions(+), 154 deletions(-) diff --git a/Controllers/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController.cpp index a5b53d0ac..7f429e0e8 100644 --- a/Controllers/RazerController/RazerController.cpp +++ b/Controllers/RazerController/RazerController.cpp @@ -178,9 +178,9 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha case RAZER_LANCEHEAD_WIRELESS_PID: case RAZER_LANCEHEAD_WIRELESS_RECEIVER_PID: case RAZER_LANCEHEAD_WIRELESS_WIRED_PID: + case RAZER_MAMBA_2018_WIRED_PID: + case RAZER_MAMBA_2018_WIRELESS_PID: case RAZER_MAMBA_ELITE_PID: - case RAZER_MAMBA_WIRELESS_RECEIVER_PID: - case RAZER_MAMBA_WIRELESS_WIRED_PID: case RAZER_MOUSE_BUNGEE_V3_CHROMA_PID: case RAZER_NAGA_TRINITY_PID: case RAZER_NOMMO_CHROMA_PID: @@ -203,8 +203,8 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha case RAZER_DIAMONDBACK_CHROMA_PID: case RAZER_FIREFLY_PID: case RAZER_MAMBA_TE_WIRED_PID: - case RAZER_MAMBA_WIRED_PID: - case RAZER_MAMBA_WIRELESS_PID: + case RAZER_MAMBA_2015_WIRED_PID: + case RAZER_MAMBA_2015_WIRELESS_PID: case RAZER_NAGA_CHROMA_PID: matrix_type = RAZER_MATRIX_TYPE_LINEAR; break; diff --git a/Controllers/RazerController/RazerControllerDetect.cpp b/Controllers/RazerController/RazerControllerDetect.cpp index f81f34528..815bea327 100644 --- a/Controllers/RazerController/RazerControllerDetect.cpp +++ b/Controllers/RazerController/RazerControllerDetect.cpp @@ -197,21 +197,83 @@ void DetectRazerKrakenControllers(hid_device_info* info, const std::string& name /*-----------------------------------------------------------------------------------------------------*\ | Keyboards | \*-----------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IPU("Razer Blackwidow Chroma", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_CHROMA_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Blackwidow Chroma V2", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_CHROMA_V2_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Blackwidow Chroma Tournament Edition", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_CHROMA_TE_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow 2019", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_2019_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blackwidow Chroma", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_CHROMA_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blackwidow Chroma Tournament Edition", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_CHROMA_TE_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blackwidow Chroma V2", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_CHROMA_V2_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blackwidow Elite", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_ELITE_PID, 0x0, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow Overwatch", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_OVERWATCH_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow X Chroma", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_X_CHROMA_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Blackwidow X Chroma Tournament Edition", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_X_CHROMA_TE_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Cynosa Chroma", DetectRazerControllers, RAZER_VID, RAZER_CYNOSA_CHROMA_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Cynosa Chroma V2", DetectRazerControllers, RAZER_VID, RAZER_CYNOSA_V2_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Cynosa Lite", DetectRazerControllers, RAZER_VID, RAZER_CYNOSA_LITE_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Deathstalker Chroma", DetectRazerControllers, RAZER_VID, RAZER_DEATHSTALKER_CHROMA_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Huntsman", DetectRazerControllers, RAZER_VID, RAZER_HUNTSMAN_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Huntsman Elite", DetectRazerControllers, RAZER_VID, RAZER_HUNTSMAN_ELITE_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Huntsman Tournament Edition", DetectRazerControllers, RAZER_VID, RAZER_HUNTSMAN_TE_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Ornata Chroma", DetectRazerControllers, RAZER_VID, RAZER_ORNATA_CHROMA_PID, 0x00, 0x01, 0x02); +/*-----------------------------------------------------------------------------------------------------*\ +| Laptops | +\*-----------------------------------------------------------------------------------------------------*/ +REGISTER_HID_DETECTOR_IPU("Razer Blade (2016)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_LATE_2016_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade (2016 QHD)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_QHD_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2018 Base)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_2018_BASE_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2018 Advanced)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_2018_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2018 Mercury)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_2018_MERCURY_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2019 Base)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_2019_BASE_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2019 Advanced)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_2019_ADV_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2019 Mercury)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_MID_2019_MERCURY_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2019 Studio)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STUDIO_EDITION_2019_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2020 Base)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_EARLY_2020_BASE_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade 15 (2020 Advanced)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_15_ADV_2020_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (2016)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_PRO_LATE_2016_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (2017)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_PRO_2017_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (2017 FullHD)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_PRO_2017_FULLHD_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (2019)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_PRO_2019_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (Late 2019)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_PRO_LATE_2019_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (2016)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STEALTH_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (Late 2016)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STEALTH_LATE_2016_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (2017)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STEALTH_MID_2017_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (Late 2017)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STEALTH_LATE_2017_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (2019)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STEALTH_2019_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (Late 2019)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STEALTH_LATE_2019_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (2020)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STEALTH_EARLY_2020_PID, 0x00, 0x01, 0x02); + +/*-----------------------------------------------------------------------------------------------------*\ +| Mice | +\*-----------------------------------------------------------------------------------------------------*/ +REGISTER_HID_DETECTOR_IPU("Razer Abyssus Elite D.Va Edition", DetectRazerControllers, RAZER_VID, RAZER_ABYSSUS_ELITE_DVA_EDITION_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Abyssus Essential", DetectRazerControllers, RAZER_VID, RAZER_ABYSSUS_ESSENTIAL_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Basilisk", DetectRazerControllers, RAZER_VID, RAZER_BASILISK_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Basilisk Essential", DetectRazerControllers, RAZER_VID, RAZER_BASILISK_ESSENTIAL_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Deathadder Chroma", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_CHROMA_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Deathadder Elite", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_ELITE_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Deathadder Essential", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_ESSENTIAL_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Deathadder Essential White Edition", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Deathadder V2", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_V2_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Diamondback", DetectRazerControllers, RAZER_VID, RAZER_DIAMONDBACK_CHROMA_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Lancehead Tournament Edition", DetectRazerControllers, RAZER_VID, RAZER_LANCEHEAD_TE_WIRED_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Lancehead (Wired)", DetectRazerControllers, RAZER_VID, RAZER_LANCEHEAD_WIRELESS_WIRED_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Lancehead (Wireless)", DetectRazerControllers, RAZER_VID, RAZER_LANCEHEAD_WIRELESS_RECEIVER_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Mamba 2012 (Wired)", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_2012_WIRED_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Mamba 2012 (Wireless)", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_2012_WIRELESS_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Mamba 2015 (Wired)", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_2015_WIRED_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Mamba 2015 (Wireless)", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_2015_WIRELESS_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Mamba 2018 (Wired)", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_2018_WIRED_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Mamba 2018 (Wireless)", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_2018_WIRELESS_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Mamba Elite", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_ELITE_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Mamba Tournament Edition", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_TE_WIRED_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Naga Chroma", DetectRazerControllers, RAZER_VID, RAZER_NAGA_CHROMA_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Naga Epic Chroma", DetectRazerControllers, RAZER_VID, RAZER_NAGA_EPIC_CHROMA_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Naga Hex V2", DetectRazerControllers, RAZER_VID, RAZER_NAGA_HEX_V2_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Naga Trinity", DetectRazerControllers, RAZER_VID, RAZER_NAGA_TRINITY_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Viper", DetectRazerControllers, RAZER_VID, RAZER_VIPER_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Viper Mini", DetectRazerControllers, RAZER_VID, RAZER_VIPER_MINI_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Viper Ultimate (Wired)", DetectRazerControllers, RAZER_VID, RAZER_VIPER_ULTIMATE_WIRED_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Viper Ultimate (Wireless)", DetectRazerControllers, RAZER_VID, RAZER_VIPER_ULTIMATE_WIRELESS_PID, 0x00, 0x01, 0x02); + /*-----------------------------------------------------------------------------------------------------*\ | Keypads | \*-----------------------------------------------------------------------------------------------------*/ @@ -220,28 +282,23 @@ REGISTER_HID_DETECTOR_IPU("Razer Tartarus Chroma", Det REGISTER_HID_DETECTOR_IPU("Razer Tartarus V2", DetectRazerControllers, RAZER_VID, RAZER_TARTARUS_V2_PID, 0x00, 0x01, 0x02); /*-----------------------------------------------------------------------------------------------------*\ -| Laptops | +| Headsets | \*-----------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IPU("Razer Blade Pro", DetectRazerControllers, RAZER_VID, RAZER_BLADE_PRO_LATE_2016_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (2017)", DetectRazerControllers, RAZER_VID, RAZER_BLADE_PRO_2017_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth", DetectRazerControllers, RAZER_VID, RAZER_BLADE_STEALTH_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_CLASSIC_PID, 0x00, 0x0C, 0x01); +REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_CLASSIC_ALT_PID, 0x00, 0x0C, 0x01); +REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1 Chroma", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_PID, 0x00, 0x0C, 0x01); +REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1 V2", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_V2_PID, 0x00, 0x0C, 0x01); +REGISTER_HID_DETECTOR_IPU("Razer Kraken Kitty Edition", DetectRazerControllers, RAZER_VID, RAZER_KRAKEN_KITTY_EDITION_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Kraken Ultimate", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_ULTIMATE_PID, 0x00, 0x0C, 0x01); /*-----------------------------------------------------------------------------------------------------*\ -| Mice | +| Mousemats | \*-----------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IPU("Razer Basilisk", DetectRazerControllers, RAZER_VID, RAZER_BASILISK_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Basilisk Essential", DetectRazerControllers, RAZER_VID, RAZER_BASILISK_ESSENTIAL_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Deathadder Chroma", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_CHROMA_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Deathadder Elite", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_ELITE_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Deathadder Essential", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_ESSENTIAL_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Deathadder Essential White Edition", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_ESSENTIAL_WHITE_EDITION_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Deathadder V2", DetectRazerControllers, RAZER_VID, RAZER_DEATHADDER_V2_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Diamondback", DetectRazerControllers, RAZER_VID, RAZER_DIAMONDBACK_CHROMA_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Mamba Elite", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_ELITE_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Mamba Tournament Edition", DetectRazerControllers, RAZER_VID, RAZER_MAMBA_TE_WIRED_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Naga Chroma", DetectRazerControllers, RAZER_VID, RAZER_NAGA_CHROMA_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Naga Epic Chroma", DetectRazerControllers, RAZER_VID, RAZER_NAGA_EPIC_CHROMA_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Naga Trinity", DetectRazerControllers, RAZER_VID, RAZER_NAGA_TRINITY_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Firefly", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Firefly V2", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_V2_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Firefly Hyperflux", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_HYPERFLUX_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Goliathus", DetectRazerControllers, RAZER_VID, RAZER_GOLIATHUS_CHROMA_PID, 0x00, 0x01, 0x02); +REGISTER_HID_DETECTOR_IPU("Razer Goliathus Extended", DetectRazerControllers, RAZER_VID, RAZER_GOLIATHUS_CHROMA_EXTENDED_PID, 0x00, 0x01, 0x02); /*-----------------------------------------------------------------------------------------------------*\ | Accessories | @@ -254,21 +311,6 @@ REGISTER_HID_DETECTOR_IPU("Razer Chroma HDK", Det REGISTER_HID_DETECTOR_IPU("Razer Chroma Mug Holder", DetectRazerControllers, RAZER_VID, RAZER_CHROMA_MUG_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Chroma PC Case Lighting Kit", DetectRazerControllers, RAZER_VID, RAZER_CHROMA_PC_CASE_LIGHTING_KIT_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Core", DetectRazerControllers, RAZER_VID, RAZER_CORE_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Firefly", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Firefly V2", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_V2_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Firefly Hyperflux", DetectRazerControllers, RAZER_VID, RAZER_FIREFLY_HYPERFLUX_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Goliathus", DetectRazerControllers, RAZER_VID, RAZER_GOLIATHUS_CHROMA_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Goliathus Extended", DetectRazerControllers, RAZER_VID, RAZER_GOLIATHUS_CHROMA_EXTENDED_PID, 0x00, 0x01, 0x02); -REGISTER_HID_DETECTOR_IPU("Razer Kraken Kitty Edition", DetectRazerControllers, RAZER_VID, RAZER_KRAKEN_KITTY_EDITION_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Mouse Bungee V3 Chroma", DetectRazerControllers, RAZER_VID, RAZER_MOUSE_BUNGEE_V3_CHROMA_PID, 0x00, 0x01, 0x02); REGISTER_HID_DETECTOR_IPU("Razer Nommo Chroma", DetectRazerControllers, RAZER_VID, RAZER_NOMMO_CHROMA_PID, 0x00, 0x01, 0x03); REGISTER_HID_DETECTOR_IPU("Razer Nommo Pro", DetectRazerControllers, RAZER_VID, RAZER_NOMMO_PRO_PID, 0x00, 0x01, 0x03); - -/*-----------------------------------------------------------------------------------------------------*\ -| Headsets | -\*-----------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_CLASSIC_PID, 0x00, 0x0C, 0x01); -REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_CLASSIC_ALT_PID, 0x00, 0x0C, 0x01); -REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1 Chroma", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_PID, 0x00, 0x0C, 0x01); -REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1 V2", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_V2_PID, 0x00, 0x0C, 0x01); -REGISTER_HID_DETECTOR_IPU("Razer Kraken Ultimate", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_ULTIMATE_PID, 0x00, 0x0C, 0x01); diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h index 8b388c629..afb84eabe 100644 --- a/Controllers/RazerController/RazerDevices.h +++ b/Controllers/RazerController/RazerDevices.h @@ -96,12 +96,12 @@ #define RAZER_LANCEHEAD_WIRELESS_WIRED_PID 0x0070 #define RAZER_MAMBA_2012_WIRED_PID 0x0024 #define RAZER_MAMBA_2012_WIRELESS_PID 0x0025 +#define RAZER_MAMBA_2015_WIRED_PID 0x0044 +#define RAZER_MAMBA_2015_WIRELESS_PID 0x0045 +#define RAZER_MAMBA_2018_WIRED_PID 0x0073 +#define RAZER_MAMBA_2018_WIRELESS_PID 0x0072 #define RAZER_MAMBA_ELITE_PID 0x006C #define RAZER_MAMBA_TE_WIRED_PID 0x0046 -#define RAZER_MAMBA_WIRED_PID 0x0044 -#define RAZER_MAMBA_WIRELESS_PID 0x0045 -#define RAZER_MAMBA_WIRELESS_RECEIVER_PID 0x0072 -#define RAZER_MAMBA_WIRELESS_WIRED_PID 0x0073 #define RAZER_NAGA_2012_PID 0x002E #define RAZER_NAGA_2014_PID 0x0040 #define RAZER_NAGA_CHROMA_PID 0x0053 @@ -3626,13 +3626,13 @@ static const razer_device mamba_2012_wireless_device = }; /*-------------------------------------------------------------*\ -| Razer Mamba (Wired) | +| Razer Mamba 2015 (Wired) | | | | Zone "Chroma Zone" | | Single | | 15 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone mamba_wired_zone = +static const razer_zone mamba_2015_wired_zone = { "Chroma Zone", ZONE_TYPE_LINEAR, @@ -3640,16 +3640,16 @@ static const razer_zone mamba_wired_zone = 15 }; -static const razer_device mamba_wired_device = +static const razer_device mamba_2015_wired_device = { - "Razer Mamba (Wired)", - RAZER_MAMBA_WIRED_PID, + "Razer Mamba 2015 (Wired)", + RAZER_MAMBA_2015_WIRED_PID, DEVICE_TYPE_MOUSE, false, 1, 15, { - &mamba_wired_zone, + &mamba_2015_wired_zone, NULL, NULL, NULL, @@ -3661,13 +3661,13 @@ static const razer_device mamba_wired_device = }; /*-------------------------------------------------------------*\ -| Razer Mamba (Wireless) | +| Razer Mamba 2015 (Wireless) | | | | Zone "Chroma Zone" | | Single | | 15 LED | \*-------------------------------------------------------------*/ -static const razer_zone mamba_wireless_zone = +static const razer_zone mamba_2015_wireless_zone = { "Chroma Zone", ZONE_TYPE_LINEAR, @@ -3675,16 +3675,16 @@ static const razer_zone mamba_wireless_zone = 15 }; -static const razer_device mamba_wireless_device = +static const razer_device mamba_2015_wireless_device = { "Razer Mamba (Wireless)", - RAZER_MAMBA_WIRELESS_PID, + RAZER_MAMBA_2015_WIRELESS_PID, DEVICE_TYPE_MOUSE, false, 1, 15, { - &mamba_wireless_zone, + &mamba_2015_wireless_zone, NULL, NULL, NULL, @@ -3695,6 +3695,101 @@ static const razer_device mamba_wireless_device = 0 }; +/*-------------------------------------------------------------*\ +| Razer Mamba 2018 (Wired) | +| | +| Zone "Logo" | +| Single | +| 1 LED | +| | +| Zone "Scroll Wheel" | +| Single | +| 1 LED | +\*-------------------------------------------------------------*/ +static const razer_zone mamba_2018_wired_logo_zone = +{ + "Logo Zone", + ZONE_TYPE_SINGLE, + 1, + 1 +}; + +static const razer_zone mamba_2018_wired_scroll_wheel_zone = +{ + "Scroll Wheel Zone", + ZONE_TYPE_SINGLE, + 1, + 1 +}; + +static const razer_device mamba_2018_wired_device = +{ + "Razer Mamba 2018 (Wired)", + RAZER_MAMBA_2018_WIRED_PID, + DEVICE_TYPE_MOUSE, + true, + 1, + 2, + { + &mamba_2018_wired_scroll_wheel_zone, + &mamba_2018_wired_logo_zone, + NULL, + NULL, + NULL, + NULL + }, + NULL, + 0 +}; + +/*-------------------------------------------------------------*\ +| Razer Mamba Wireless (2018) Wireless 1532:0072 | +| | +| Zone "Logo" | +| Single | +| 1 LED | +| | +| Zone "Scroll Wheel" | +| Single | +| 1 LED | +\*-------------------------------------------------------------*/ + +static const razer_zone mamba_2018_wireless_logo_zone = +{ + "Logo Zone", + ZONE_TYPE_SINGLE, + 1, + 1 +}; + +static const razer_zone mamba_2018_wireless_scroll_wheel_zone = +{ + "Scroll Wheel Zone", + ZONE_TYPE_SINGLE, + 1, + 1 +}; + +static const razer_device mamba_2018_wireless_device = +{ + "Razer Mamba 2018 (Wireless)", + RAZER_MAMBA_2018_WIRELESS_PID, + DEVICE_TYPE_MOUSE, + true, + 1, + 2, + { + &mamba_2018_wireless_scroll_wheel_zone, + &mamba_2018_wireless_logo_zone, + NULL, + NULL, + NULL, + NULL + }, + NULL, + 0 +}; + /*-------------------------------------------------------------*\ | Razer Mamba Elite | | | @@ -3838,101 +3933,6 @@ static const razer_device mamba_te_device = 0 }; -/*-------------------------------------------------------------*\ -| Razer Mamba Wireless (2018) Wired 1532:0073 | -| | -| Zone "Logo" | -| Single | -| 1 LED | -| | -| Zone "Scroll Wheel" | -| Single | -| 1 LED | -\*-------------------------------------------------------------*/ -static const razer_zone mamba_wireless_2018_wired_logo_zone = -{ - "Logo Zone", - ZONE_TYPE_SINGLE, - 1, - 1 -}; - -static const razer_zone mamba_wireless_2018_wired_scroll_wheel_zone = -{ - "Scroll Wheel Zone", - ZONE_TYPE_SINGLE, - 1, - 1 -}; - -static const razer_device mamba_wireless_2018_wired_device = -{ - "Razer Mamba Wireless (Wired)", - RAZER_MAMBA_WIRELESS_WIRED_PID, - DEVICE_TYPE_MOUSE, - true, - 1, - 2, - { - &mamba_wireless_2018_wired_scroll_wheel_zone, - &mamba_wireless_2018_wired_logo_zone, - NULL, - NULL, - NULL, - NULL - }, - NULL, - 0 -}; - -/*-------------------------------------------------------------*\ -| Razer Mamba Wireless (2018) Wireless 1532:0072 | -| | -| Zone "Logo" | -| Single | -| 1 LED | -| | -| Zone "Scroll Wheel" | -| Single | -| 1 LED | -\*-------------------------------------------------------------*/ - -static const razer_zone mamba_wireless_2018_wireless_logo_zone = -{ - "Logo Zone", - ZONE_TYPE_SINGLE, - 1, - 1 -}; - -static const razer_zone mamba_wireless_2018_wireless_scroll_wheel_zone = -{ - "Scroll Wheel Zone", - ZONE_TYPE_SINGLE, - 1, - 1 -}; - -static const razer_device mamba_wireless_2018_wireless_device = -{ - "Razer Mamba Wireless (Receiver)", - RAZER_MAMBA_WIRELESS_RECEIVER_PID, - DEVICE_TYPE_MOUSE, - true, - 1, - 2, - { - &mamba_wireless_2018_wireless_scroll_wheel_zone, - &mamba_wireless_2018_wireless_logo_zone, - NULL, - NULL, - NULL, - NULL - }, - NULL, - 0 -}; - /*-------------------------------------------------------------*\ | Razer Naga Chroma | | | @@ -5324,12 +5324,12 @@ static const razer_device* device_list[] = &lancehead_v2_wireless_device, &mamba_2012_wired_device, &mamba_2012_wireless_device, - &mamba_wired_device, - &mamba_wireless_device, + &mamba_2015_wired_device, + &mamba_2015_wireless_device, + &mamba_2018_wired_device, + &mamba_2018_wireless_device, &mamba_te_device, &mamba_elite_device, - &mamba_wireless_2018_wired_device, - &mamba_wireless_2018_wireless_device, &naga_chroma_device, &naga_epic_chroma_device, &naga_hex_v2_device,