Make Corsair K55 behavior be closer to iCue's

guaycuru · CalcProgrammer1 · commit b3b392b3e281 · 2021-05-30T22:33:31.000Z
diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp
@@ -59,18 +59,18 @@ CorsairPeripheralController::CorsairPeripheralController(hid_device* dev_handle,
     ReadFirmwareInfo();
 
     /*-----------------------------------------------------*\
-    | K95 Platinum requires additional steps                |
+    | K55 and K95 Platinum require additional steps         |
     \*-----------------------------------------------------*/
-    if (logical_layout == CORSAIR_TYPE_K95_PLAT)
+    if (logical_layout == CORSAIR_TYPE_K55 || logical_layout == CORSAIR_TYPE_K95_PLAT)
     {
         SpecialFunctionControl();
     }
 
     LightingControl();
 
-    if (logical_layout == CORSAIR_TYPE_K95_PLAT)
+    if (logical_layout == CORSAIR_TYPE_K55 || logical_layout == CORSAIR_TYPE_K95_PLAT)
     {
-        SetupK95LightingControl();
+        SetupK55AndK95LightingControl();
     }
 }
 
@@ -232,7 +232,6 @@ void CorsairPeripheralController::SetLEDsKeyboardFull(std::vector<RGBColor> colo
     SubmitKeyboardFullColors(3, 3, 2);
 }
 
-
 void CorsairPeripheralController::SetLEDsMouse(std::vector<RGBColor> colors)
 {
     SubmitMouseColors(colors.size(), &colors[0]);
@@ -370,7 +369,7 @@ void CorsairPeripheralController::LightingControl()
 | Probably a key mapping packet?                        |
 \*-----------------------------------------------------*/
 
-void CorsairPeripheralController::SetupK95LightingControl()
+void CorsairPeripheralController::SetupK55AndK95LightingControl()
 {
     char usb_buf[65];
 
@@ -535,7 +534,6 @@ void CorsairPeripheralController::ReadFirmwareInfo()
 
                     case 0x1B3D:
                     logical_layout = CORSAIR_TYPE_K55;
-                    SpecialFunctionControl();
                     break;
 
                     default:
diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralController.h b/Controllers/CorsairPeripheralController/CorsairPeripheralController.h
@@ -97,7 +97,7 @@ class CorsairPeripheralController
     int                     logical_layout;    //Normal, K95 or K95 Platinum
 
     void    LightingControl();
-    void    SetupK95LightingControl();
+    void    SetupK55AndK95LightingControl();
     void    SpecialFunctionControl();
 
     void    ReadFirmwareInfo();
diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp
@@ -91,7 +91,7 @@ void DetectCorsairPeripheralControllers(hid_device_info* info, const std::string
 /*-----------------------------------------------------------------------------------------------------*\
 | Keyboards                                                                                             |
 \*-----------------------------------------------------------------------------------------------------*/
-REGISTER_HID_DETECTOR_IP("Corsair K55 RGB",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K55_RGB_PID,           1, 0xFFC2); // Not per-key, disabled for now
+REGISTER_HID_DETECTOR_IP("Corsair K55 RGB",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K55_RGB_PID,           1, 0xFFC2);
 REGISTER_HID_DETECTOR_IP("Corsair K65 RGB",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K65_RGB_PID,           1, 0xFFC2);
 REGISTER_HID_DETECTOR_IP("Corsair K65 LUX RGB",              DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K65_LUX_RGB_PID,       1, 0xFFC2);
 REGISTER_HID_DETECTOR_IP("Corsair K65 RGB RAPIDFIRE",        DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K65_RGB_RAPIDFIRE_PID, 1, 0xFFC2);

Original file line number	Diff line number	Diff line change
`@@ -59,18 +59,18 @@ CorsairPeripheralController::CorsairPeripheralController(hid_device* dev_handle,`
`59`	`59`	`ReadFirmwareInfo();`
`60`	`60`
`61`	`61`	`/-----------------------------------------------------\`
`62`		`- \| K95 Platinum requires additional steps \|`
	`62`	`+ \| K55 and K95 Platinum require additional steps \|`
`63`	`63`	`\-----------------------------------------------------/`
`64`		`- if (logical_layout == CORSAIR_TYPE_K95_PLAT)`
	`64`	`+ if (logical_layout == CORSAIR_TYPE_K55 \|\| logical_layout == CORSAIR_TYPE_K95_PLAT)`
`65`	`65`	`{`
`66`	`66`	`SpecialFunctionControl();`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`LightingControl();`
`70`	`70`
`71`		`- if (logical_layout == CORSAIR_TYPE_K95_PLAT)`
	`71`	`+ if (logical_layout == CORSAIR_TYPE_K55 \|\| logical_layout == CORSAIR_TYPE_K95_PLAT)`
`72`	`72`	`{`
`73`		`- SetupK95LightingControl();`
	`73`	`+ SetupK55AndK95LightingControl();`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`@@ -232,7 +232,6 @@ void CorsairPeripheralController::SetLEDsKeyboardFull(std::vector<RGBColor> colo`
`232`	`232`	`SubmitKeyboardFullColors(3, 3, 2);`
`233`	`233`	`}`
`234`	`234`
`235`		`-`
`236`	`235`	`void CorsairPeripheralController::SetLEDsMouse(std::vector<RGBColor> colors)`
`237`	`236`	`{`
`238`	`237`	`SubmitMouseColors(colors.size(), &colors[0]);`
`@@ -370,7 +369,7 @@ void CorsairPeripheralController::LightingControl()`
`370`	`369`	`\| Probably a key mapping packet? \|`
`371`	`370`	`\-----------------------------------------------------/`
`372`	`371`
`373`		`-void CorsairPeripheralController::SetupK95LightingControl()`
	`372`	`+void CorsairPeripheralController::SetupK55AndK95LightingControl()`
`374`	`373`	`{`
`375`	`374`	`char usb_buf[65];`
`376`	`375`
`@@ -535,7 +534,6 @@ void CorsairPeripheralController::ReadFirmwareInfo()`
`535`	`534`
`536`	`535`	`case 0x1B3D:`
`537`	`536`	`logical_layout = CORSAIR_TYPE_K55;`
`538`		`- SpecialFunctionControl();`
`539`	`537`	`break;`
`540`	`538`
`541`	`539`	`default:`