Remove SetCustomMode from all controllers beginning with the letter R

CalcProgrammer1 · CalcProgrammer1 · commit 66c856f49a33 · 2022-08-21T18:23:34.000-05:00
diff --git a/Controllers/RedragonController/RGBController_RedragonM711.cpp b/Controllers/RedragonController/RGBController_RedragonM711.cpp
@@ -20,16 +20,16 @@
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* redragon_ptr)
+RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* controller_ptr)
 {
-    redragon = redragon_ptr;
+    controller  = controller_ptr;
 
     name        = "Redragon Mouse Device";
     vendor      = "Redragon";
     type        = DEVICE_TYPE_MOUSE;
     description = "Redragon Mouse Device";
-    location    = redragon->GetDeviceLocation();
-    serial      = redragon->GetSerialString();
+    location    = controller->GetDeviceLocation();
+    serial      = controller->GetSerialString();
 
     mode Static;
     Static.name       = "Static";
@@ -71,7 +71,7 @@ RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* r
 
 RGBController_RedragonM711::~RGBController_RedragonM711()
 {
-    delete redragon;
+    delete controller;
 }
 
 void RGBController_RedragonM711::SetupZones()
@@ -105,8 +105,8 @@ void RGBController_RedragonM711::DeviceUpdateLEDs()
     unsigned char grn = RGBGetGValue(colors[0]);
     unsigned char blu = RGBGetBValue(colors[0]);
 
-    redragon->SendMouseColor(red, grn, blu);
-    redragon->SendMouseApply();
+    controller->SendMouseColor(red, grn, blu);
+    controller->SendMouseApply();
 }
 
 void RGBController_RedragonM711::UpdateZoneLEDs(int /*zone*/)
@@ -119,11 +119,6 @@ void RGBController_RedragonM711::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_RedragonM711::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_RedragonM711::DeviceUpdateMode()
 {
     bool random       = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
@@ -133,12 +128,12 @@ void RGBController_RedragonM711::DeviceUpdateMode()
 
     if((modes[active_mode].value == REDRAGON_M711_MODE_BREATHING) && random)
     {
-        redragon->SendMouseMode(REDRAGON_M711_MODE_RANDOM_BREATHING, 0, red, grn, blu);
+        controller->SendMouseMode(REDRAGON_M711_MODE_RANDOM_BREATHING, 0, red, grn, blu);
     }
     else
     {
-        redragon->SendMouseMode(modes[active_mode].value, 0, red, grn, blu);
+        controller->SendMouseMode(modes[active_mode].value, 0, red, grn, blu);
     }
 
-    redragon->SendMouseApply();
+    controller->SendMouseApply();
 }
diff --git a/Controllers/RedragonController/RGBController_RedragonM711.h b/Controllers/RedragonController/RGBController_RedragonM711.h
@@ -14,20 +14,18 @@
 class RGBController_RedragonM711 : public RGBController
 {
 public:
-    RGBController_RedragonM711(RedragonM711Controller* redragon_ptr);
+    RGBController_RedragonM711(RedragonM711Controller* controller_ptr);
     ~RGBController_RedragonM711();
 
     void        SetupZones();
-
     void        ResizeZone(int zone, int new_size);
     
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
-    RedragonM711Controller*   redragon;
+    RedragonM711Controller*   controller;
 };
diff --git a/Controllers/RoccatController/RGBController_RoccatBurst.cpp b/Controllers/RoccatController/RGBController_RoccatBurst.cpp
@@ -170,11 +170,6 @@ void RGBController_RoccatBurst::UpdateSingleLED(int /*led_idx*/)
     UpdateZoneLEDs(0);
 }
 
-void RGBController_RoccatBurst::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_RoccatBurst::DeviceUpdateMode()
 {
     if(modes[active_mode].value == ROCCAT_BURST_DIRECT_MODE_VALUE)
diff --git a/Controllers/RoccatController/RGBController_RoccatBurst.h b/Controllers/RoccatController/RGBController_RoccatBurst.h
@@ -19,10 +19,11 @@ class RGBController_RoccatBurst : public RGBController
 
     void        SetupZones();
     void        ResizeZone(int zone, int new_size);
+
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
-    void        SetCustomMode();
+
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp b/Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp
@@ -87,11 +87,6 @@ void RGBController_RoccatHordeAimo::UpdateSingleLED(int /*led_idx*/)
     UpdateZoneLEDs(0);
 }
 
-void RGBController_RoccatHordeAimo::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_RoccatHordeAimo::DeviceUpdateMode()
 {
 
diff --git a/Controllers/RoccatController/RGBController_RoccatHordeAimo.h b/Controllers/RoccatController/RGBController_RoccatHordeAimo.h
@@ -18,14 +18,12 @@ class RGBController_RoccatHordeAimo : public RGBController
     ~RGBController_RoccatHordeAimo();
 
     void        SetupZones();
-
     void        ResizeZone(int zone, int new_size);
 
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp b/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp
@@ -20,15 +20,16 @@
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_RoccatKoneAimo::RGBController_RoccatKoneAimo(RoccatKoneAimoController* mouse_ptr)
+RGBController_RoccatKoneAimo::RGBController_RoccatKoneAimo(RoccatKoneAimoController* controller_ptr)
 {
+    controller  = controller_ptr;
+
     name        = "Roccat Kone Aimo";
     vendor      = "Roccat";
     type        = DEVICE_TYPE_MOUSE;
     description = "Roccat Kone Aimo Mouse";
-    mouse       = mouse_ptr;
-    location    = mouse->GetLocation();
-    serial      = mouse->GetSerial();
+    location    = controller->GetLocation();
+    serial      = controller->GetSerial();
 
     mode Direct;
     Direct.name       = "Direct";
@@ -43,12 +44,11 @@ RGBController_RoccatKoneAimo::RGBController_RoccatKoneAimo(RoccatKoneAimoControl
     active_mode = 0;
 
     SetupZones();
-
 }
 
 RGBController_RoccatKoneAimo::~RGBController_RoccatKoneAimo()
 {
-    delete mouse;
+    delete controller;
 }
 
 void RGBController_RoccatKoneAimo::SetupZones()
@@ -171,24 +171,24 @@ void RGBController_RoccatKoneAimo::DeviceUpdateLEDs()
     \*---------------------------------------------------------*/
     for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
-        mouse->SetChannelColors(zones_channel[zone_idx], zones[zone_idx].colors, zones[zone_idx].leds_count);
+        controller->SetChannelColors(zones_channel[zone_idx], zones[zone_idx].colors, zones[zone_idx].leds_count);
     }
     /*---------------------------------------------------------*\
     | Apply new colors to the mouse                             |
     \*---------------------------------------------------------*/
-    mouse->SendUpdate();
+    controller->SendUpdate();
 }
 
 void RGBController_RoccatKoneAimo::UpdateZoneLEDs(int zone_idx)
 {
     /*---------------------------------------------------------*\
     | Set colors for one channel of leds                        |
     \*---------------------------------------------------------*/
-    mouse->SetChannelColors(zones_channel[zone_idx], zones[zone_idx].colors, zones[zone_idx].leds_count);
+    controller->SetChannelColors(zones_channel[zone_idx], zones[zone_idx].colors, zones[zone_idx].leds_count);
     /*---------------------------------------------------------*\
     | Apply new colors to the mouse                             |
     \*---------------------------------------------------------*/
-    mouse->SendUpdate();
+    controller->SendUpdate();
 }
 
 void RGBController_RoccatKoneAimo::UpdateSingleLED(int led_idx)
@@ -200,16 +200,11 @@ void RGBController_RoccatKoneAimo::UpdateSingleLED(int led_idx)
     /*---------------------------------------------------------*\
     | Update channel corresponding to led                       |
     \*---------------------------------------------------------*/
-    mouse->SetChannelColors(channel, zones[leds[led_idx].value].colors, zones[leds[led_idx].value].leds_count);
+    controller->SetChannelColors(channel, zones[leds[led_idx].value].colors, zones[leds[led_idx].value].leds_count);
     /*---------------------------------------------------------*\
     | Apply new colors to the mouse                             |
     \*---------------------------------------------------------*/
-    mouse->SendUpdate();
-}
-
-void RGBController_RoccatKoneAimo::SetCustomMode()
-{
-    active_mode = 0;
+    controller->SendUpdate();
 }
 
 void RGBController_RoccatKoneAimo::DeviceUpdateMode()
diff --git a/Controllers/RoccatController/RGBController_RoccatKoneAimo.h b/Controllers/RoccatController/RGBController_RoccatKoneAimo.h
@@ -14,22 +14,20 @@
 class RGBController_RoccatKoneAimo : public RGBController
 {
 public:
-    RGBController_RoccatKoneAimo(RoccatKoneAimoController* mouse_ptr);
+    RGBController_RoccatKoneAimo(RoccatKoneAimoController* controller_ptr);
     ~RGBController_RoccatKoneAimo();
 
     void        SetupZones();
-
     void        ResizeZone(int zone, int new_size);
 
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
-    RoccatKoneAimoController*                   mouse;
+    RoccatKoneAimoController*                   controller;
     std::vector<ROCCAT_KONE_AIMO_CHANNEL>       zones_channel;
     std::vector<ROCCAT_KONE_AIMO_CHANNEL>       leds_channel;
 };
diff --git a/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp b/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp
@@ -276,11 +276,6 @@ void RGBController_RoccatVulcanAimo::UpdateSingleLED(int /*led_idx*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_RoccatVulcanAimo::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_RoccatVulcanAimo::DeviceUpdateMode()
 {
     controller->SendMode(modes[active_mode].value, modes[active_mode].speed, modes[active_mode].brightness, colors);
diff --git a/Controllers/RoccatController/RGBController_RoccatVulcanAimo.h b/Controllers/RoccatController/RGBController_RoccatVulcanAimo.h
@@ -28,14 +28,12 @@ class RGBController_RoccatVulcanAimo : public RGBController
     ~RGBController_RoccatVulcanAimo();
 
     void        SetupZones();
-
     void        ResizeZone(int zone, int new_size);
 
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,16 @@`
`20`	`20`	`@comment`
`21`	`21`	`\-------------------------------------------------------------------/`
`22`	`22`
`23`		`-RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* redragon_ptr)`
	`23`	`+RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* controller_ptr)`
`24`	`24`	`{`
`25`		`- redragon = redragon_ptr;`
	`25`	`+ controller = controller_ptr;`
`26`	`26`
`27`	`27`	`name = "Redragon Mouse Device";`
`28`	`28`	`vendor = "Redragon";`
`29`	`29`	`type = DEVICE_TYPE_MOUSE;`
`30`	`30`	`description = "Redragon Mouse Device";`
`31`		`- location = redragon->GetDeviceLocation();`
`32`		`- serial = redragon->GetSerialString();`
	`31`	`+ location = controller->GetDeviceLocation();`
	`32`	`+ serial = controller->GetSerialString();`
`33`	`33`
`34`	`34`	`mode Static;`
`35`	`35`	`Static.name = "Static";`
`@@ -71,7 +71,7 @@ RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* r`
`71`	`71`
`72`	`72`	`RGBController_RedragonM711::~RGBController_RedragonM711()`
`73`	`73`	`{`
`74`		`- delete redragon;`
	`74`	`+ delete controller;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`void RGBController_RedragonM711::SetupZones()`
`@@ -105,8 +105,8 @@ void RGBController_RedragonM711::DeviceUpdateLEDs()`
`105`	`105`	`unsigned char grn = RGBGetGValue(colors[0]);`
`106`	`106`	`unsigned char blu = RGBGetBValue(colors[0]);`
`107`	`107`
`108`		`- redragon->SendMouseColor(red, grn, blu);`
`109`		`- redragon->SendMouseApply();`
	`108`	`+ controller->SendMouseColor(red, grn, blu);`
	`109`	`+ controller->SendMouseApply();`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`void RGBController_RedragonM711::UpdateZoneLEDs(int /zone/)`
`@@ -119,11 +119,6 @@ void RGBController_RedragonM711::UpdateSingleLED(int /led/)`
`119`	`119`	`DeviceUpdateLEDs();`
`120`	`120`	`}`
`121`	`121`
`122`		`-void RGBController_RedragonM711::SetCustomMode()`
`123`		`-{`
`124`		`- active_mode = 0;`
`125`		`-}`
`126`		`-`
`127`	`122`	`void RGBController_RedragonM711::DeviceUpdateMode()`
`128`	`123`	`{`
`129`	`124`	`bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);`
`@@ -133,12 +128,12 @@ void RGBController_RedragonM711::DeviceUpdateMode()`
`133`	`128`
`134`	`129`	`if((modes[active_mode].value == REDRAGON_M711_MODE_BREATHING) && random)`
`135`	`130`	`{`
`136`		`- redragon->SendMouseMode(REDRAGON_M711_MODE_RANDOM_BREATHING, 0, red, grn, blu);`
	`131`	`+ controller->SendMouseMode(REDRAGON_M711_MODE_RANDOM_BREATHING, 0, red, grn, blu);`
`137`	`132`	`}`
`138`	`133`	`else`
`139`	`134`	`{`
`140`		`- redragon->SendMouseMode(modes[active_mode].value, 0, red, grn, blu);`
	`135`	`+ controller->SendMouseMode(modes[active_mode].value, 0, red, grn, blu);`
`141`	`136`	`}`
`142`	`137`
`143`		`- redragon->SendMouseApply();`
	`138`	`+ controller->SendMouseApply();`
`144`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,11 +170,6 @@ void RGBController_RoccatBurst::UpdateSingleLED(int /led_idx/)`
`170`	`170`	`UpdateZoneLEDs(0);`
`171`	`171`	`}`
`172`	`172`
`173`		`-void RGBController_RoccatBurst::SetCustomMode()`
`174`		`-{`
`175`		`- active_mode = 0;`
`176`		`-}`
`177`		`-`
`178`	`173`	`void RGBController_RoccatBurst::DeviceUpdateMode()`
`179`	`174`	`{`
`180`	`175`	`if(modes[active_mode].value == ROCCAT_BURST_DIRECT_MODE_VALUE)`
Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,6 @@ void RGBController_RoccatHordeAimo::UpdateSingleLED(int /led_idx/)`
`87`	`87`	`UpdateZoneLEDs(0);`
`88`	`88`	`}`
`89`	`89`
`90`		`-void RGBController_RoccatHordeAimo::SetCustomMode()`
`91`		`-{`
`92`		`- active_mode = 0;`
`93`		`-}`
`94`		`-`
`95`	`90`	`void RGBController_RoccatHordeAimo::DeviceUpdateMode()`
`96`	`91`	`{`
`97`	`92`
Original file line number	Diff line number	Diff line change
`@@ -276,11 +276,6 @@ void RGBController_RoccatVulcanAimo::UpdateSingleLED(int /led_idx/)`
`276`	`276`	`DeviceUpdateLEDs();`
`277`	`277`	`}`
`278`	`278`
`279`		`-void RGBController_RoccatVulcanAimo::SetCustomMode()`
`280`		`-{`
`281`		`- active_mode = 0;`
`282`		`-}`
`283`		`-`
`284`	`279`	`void RGBController_RoccatVulcanAimo::DeviceUpdateMode()`
`285`	`280`	`{`
`286`	`281`	`controller->SendMode(modes[active_mode].value, modes[active_mode].speed, modes[active_mode].brightness, colors);`