diff --git a/Controllers/RazerController/RazerControllerDetect.cpp b/Controllers/RazerController/RazerControllerDetect.cpp index 768c06bc..28ee1ab1 100644 --- a/Controllers/RazerController/RazerControllerDetect.cpp +++ b/Controllers/RazerController/RazerControllerDetect.cpp @@ -223,7 +223,7 @@ REGISTER_HID_DETECTOR_IPU("Razer Blackwidow V3 Pro (Wireless)", Det REGISTER_HID_DETECTOR_IPU("Razer Blackwidow V3 TKL", DetectRazerControllers, RAZER_VID, RAZER_BLACKWIDOW_V3_TKL_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", DetectRazerControllers, RAZER_VID, RAZER_CYNOSA_CHROMA_PID, 0x02, 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); diff --git a/Controllers/ThingMController/ThingMControllerDetect.cpp b/Controllers/ThingMController/ThingMControllerDetect.cpp index 73614521..3b811804 100644 --- a/Controllers/ThingMController/ThingMControllerDetect.cpp +++ b/Controllers/ThingMController/ThingMControllerDetect.cpp @@ -28,4 +28,4 @@ void DetectThingMBlink(hid_device_info* info, const std::string&) } } -REGISTER_HID_DETECTOR_IPU ("ThingM blink(1) mk2", DetectThingMBlink, THINGM_VID, THINGM_BLINK_PID, 1, 0xFF00, 0x01); +REGISTER_HID_DETECTOR_PU("ThingM blink(1) mk2", DetectThingMBlink, THINGM_VID, THINGM_BLINK_PID, 0xFF00, 0x01); diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 24ce532e..fcd055da 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -853,19 +853,17 @@ void ResourceManager::DetectDevicesThreadFunction() { unsigned int addr = (current_hid_device->vendor_id << 16) | current_hid_device->product_id; - if(( ( hid_device_detectors[hid_detector_idx].address == addr ) ) + if(( ( hid_device_detectors[hid_detector_idx].address == addr ) ) #ifdef USE_HID_USAGE - && ( ( hid_device_detectors[hid_detector_idx].usage_page == HID_USAGE_PAGE_ANY ) - || ( hid_device_detectors[hid_detector_idx].usage_page == current_hid_device->usage_page ) ) - && ( ( hid_device_detectors[hid_detector_idx].usage == HID_USAGE_ANY ) - || ( hid_device_detectors[hid_detector_idx].usage == current_hid_device->usage ) ) - && ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY ) - || ( ( hid_device_detectors[hid_detector_idx].usage != HID_USAGE_PAGE_ANY ) - || ( hid_device_detectors[hid_detector_idx].usage_page != HID_USAGE_PAGE_ANY ) - || ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) ) ) + && ( ( hid_device_detectors[hid_detector_idx].usage_page == HID_USAGE_PAGE_ANY ) + || ( hid_device_detectors[hid_detector_idx].usage_page == current_hid_device->usage_page ) ) + && ( ( hid_device_detectors[hid_detector_idx].usage == HID_USAGE_ANY ) + || ( hid_device_detectors[hid_detector_idx].usage == current_hid_device->usage ) ) + && ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY ) + || ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) ) #else - && ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY ) - || ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) ) + && ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY ) + || ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) ) #endif ) { @@ -948,19 +946,17 @@ void ResourceManager::DetectDevicesThreadFunction() \*-----------------------------------------------------------------------------*/ for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_device_detectors.size() && detection_is_required.load(); hid_detector_idx++) { - if(( ( hid_device_detectors[hid_detector_idx].address == addr ) ) + if(( ( hid_device_detectors[hid_detector_idx].address == addr ) ) #ifdef USE_HID_USAGE - && ( ( hid_device_detectors[hid_detector_idx].usage_page == HID_USAGE_PAGE_ANY ) - || ( hid_device_detectors[hid_detector_idx].usage_page == current_hid_device->usage_page ) ) - && ( ( hid_device_detectors[hid_detector_idx].usage == HID_USAGE_ANY ) - || ( hid_device_detectors[hid_detector_idx].usage == current_hid_device->usage ) ) - && ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY ) - || ( ( hid_device_detectors[hid_detector_idx].usage != HID_USAGE_PAGE_ANY ) - || ( hid_device_detectors[hid_detector_idx].usage_page != HID_USAGE_PAGE_ANY ) - || ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) ) ) + && ( ( hid_device_detectors[hid_detector_idx].usage_page == HID_USAGE_PAGE_ANY ) + || ( hid_device_detectors[hid_detector_idx].usage_page == current_hid_device->usage_page ) ) + && ( ( hid_device_detectors[hid_detector_idx].usage == HID_USAGE_ANY ) + || ( hid_device_detectors[hid_detector_idx].usage == current_hid_device->usage ) ) + && ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY ) + || ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) ) #else - && ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY ) - || ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) ) + && ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY ) + || ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) ) #endif ) {