Remove SetCustomMode from all controllers beginning with the letter P

CalcProgrammer1 · CalcProgrammer1 · commit 215183f9c551 · 2022-08-21T16:24:44.000-05:00
diff --git a/Controllers/PNYGPUController/RGBController_PNYGPU.cpp b/Controllers/PNYGPUController/RGBController_PNYGPU.cpp
@@ -20,16 +20,16 @@
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_PNYGPU::RGBController_PNYGPU(PNYGPUController* pny_ptr)
+RGBController_PNYGPU::RGBController_PNYGPU(PNYGPUController* controller_ptr)
 {
-    pny = pny_ptr;
+    controller              = controller_ptr;
 
     name                    = "PNY/Palit GPU";
     vendor                  = "PNY/Palit";
     description             = "PNY/Palit RGB GPU Device";
-    location                = pny->GetDeviceLocation();
+    location                = controller->GetDeviceLocation();
 
-    type = DEVICE_TYPE_GPU;
+    type                    = DEVICE_TYPE_GPU;
 
     mode Off;
     Off.name                = "Off";
@@ -126,11 +126,6 @@ void RGBController_PNYGPU::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_PNYGPU::SetCustomMode()
-{
-    active_mode = 1;
-}
-
 void RGBController_PNYGPU::DeviceUpdateMode()
 {
     RGBColor      color = colors[0];
@@ -141,23 +136,23 @@ void RGBController_PNYGPU::DeviceUpdateMode()
     switch(modes[active_mode].value)
     {
         case PNY_GPU_MODE_OFF:
-            pny->SetOff();
+            controller->SetOff();
             break;
 
         case PNY_GPU_MODE_DIRECT:
             brightness = modes[active_mode].brightness;
-            pny->SetDirect(r, g, b, brightness);
+            controller->SetDirect(r, g, b, brightness);
             break;
 
         case PNY_GPU_MODE_CYCLE:
             speed = modes[active_mode].speed;
-            pny->SetCycle(speed);
+            controller->SetCycle(speed);
             break;
 
         case PNY_GPU_MODE_STROBE:
             speed      = modes[active_mode].speed;
             brightness = modes[active_mode].brightness;
-            pny->SetStrobe(r, g, b, speed, brightness);
+            controller->SetStrobe(r, g, b, speed, brightness);
             break;
         default:
         break;
diff --git a/Controllers/PNYGPUController/RGBController_PNYGPU.h b/Controllers/PNYGPUController/RGBController_PNYGPU.h
@@ -15,19 +15,17 @@
 class RGBController_PNYGPU : public RGBController
 {
 public:
-    RGBController_PNYGPU(PNYGPUController* pny_ptr);
+    RGBController_PNYGPU(PNYGPUController* controller_ptr);
 
     void        SetupZones();
-
     void        ResizeZone(int zone, int new_size);
 
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
-    PNYGPUController* pny;
+    PNYGPUController* controller;
 };
diff --git a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp
@@ -212,11 +212,6 @@ void RGBController_PatriotViper::UpdateSingleLED(int led)
     }
 }
 
-void RGBController_PatriotViper::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_PatriotViper::DeviceUpdateMode()
 {
     if(modes[active_mode].value == 0xFFFF)
diff --git a/Controllers/PatriotViperController/RGBController_PatriotViper.h b/Controllers/PatriotViperController/RGBController_PatriotViper.h
@@ -19,14 +19,12 @@ class RGBController_PatriotViper : public RGBController
     ~RGBController_PatriotViper();
 
     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/PatriotViperSteelController/RGBController_PatriotViperSteel.cpp b/Controllers/PatriotViperSteelController/RGBController_PatriotViperSteel.cpp
@@ -110,10 +110,6 @@ void RGBController_PatriotViperSteel::UpdateSingleLED(int led)
     controller->SetLEDColor(led, red, grn, blu);
 }
 
-void RGBController_PatriotViperSteel::SetCustomMode()
-{
-}
-
 void RGBController_PatriotViperSteel::DeviceUpdateMode()
 {
 }
diff --git a/Controllers/PatriotViperSteelController/RGBController_PatriotViperSteel.h b/Controllers/PatriotViperSteelController/RGBController_PatriotViperSteel.h
@@ -17,14 +17,12 @@ class RGBController_PatriotViperSteel : public RGBController
     ~RGBController_PatriotViperSteel();
 
     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/PhilipsHueController/RGBController_PhilipsHue.cpp b/Controllers/PhilipsHueController/RGBController_PhilipsHue.cpp
@@ -19,16 +19,16 @@
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_PhilipsHue::RGBController_PhilipsHue(PhilipsHueController* light_ptr)
+RGBController_PhilipsHue::RGBController_PhilipsHue(PhilipsHueController* controller_ptr)
 {
-    light = light_ptr;
+    controller  = controller_ptr;
 
-    name        = light->GetManufacturer() + " " + light->GetName();
+    name        = controller->GetManufacturer() + " " + controller->GetName();
     type        = DEVICE_TYPE_LIGHT;
-    version     = light->GetVersion();
+    version     = controller->GetVersion();
     description = "Philips Hue Device";
-    serial      = light->GetUniqueID();
-    location    = light->GetLocation();
+    serial      = controller->GetUniqueID();
+    location    = controller->GetLocation();
 
     mode Direct;
     Direct.name       = "Direct";
@@ -72,7 +72,7 @@ void RGBController_PhilipsHue::DeviceUpdateLEDs()
     unsigned char grn = RGBGetGValue(colors[0]);
     unsigned char blu = RGBGetBValue(colors[0]);
 
-    light->SetColor(red, grn, blu);
+    controller->SetColor(red, grn, blu);
 }
 
 void RGBController_PhilipsHue::UpdateZoneLEDs(int /*zone*/)
@@ -85,11 +85,6 @@ void RGBController_PhilipsHue::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_PhilipsHue::SetCustomMode()
-{
-
-}
-
 void RGBController_PhilipsHue::DeviceUpdateMode()
 {
 
diff --git a/Controllers/PhilipsHueController/RGBController_PhilipsHue.h b/Controllers/PhilipsHueController/RGBController_PhilipsHue.h
@@ -13,19 +13,17 @@
 class RGBController_PhilipsHue : public RGBController
 {
 public:
-    RGBController_PhilipsHue(PhilipsHueController* light_ptr);
+    RGBController_PhilipsHue(PhilipsHueController* controller_ptr);
 
     void        SetupZones();
-
     void        ResizeZone(int zone, int new_size);
 
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
-    PhilipsHueController* light;
+    PhilipsHueController* controller;
 };
diff --git a/Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.cpp b/Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.cpp
@@ -23,16 +23,16 @@ using namespace std::chrono_literals;
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_PhilipsHueEntertainment::RGBController_PhilipsHueEntertainment(PhilipsHueEntertainmentController* light_ptr)
+RGBController_PhilipsHueEntertainment::RGBController_PhilipsHueEntertainment(PhilipsHueEntertainmentController* controller_ptr)
 {
-    light = light_ptr;
+    controller  = controller_ptr;
 
-    name        = light->GetManufacturer() + " " + light->GetName();
+    name        = controller->GetManufacturer() + " " + controller->GetName();
     type        = DEVICE_TYPE_LIGHT;
-    version     = light->GetVersion();
+    version     = controller->GetVersion();
     description = "Philips Hue Entertainment Mode Device";
-    serial      = light->GetUniqueID();
-    location    = light->GetLocation();
+    serial      = controller->GetUniqueID();
+    location    = controller->GetLocation();
 
     mode Direct;
     Direct.name       = "Direct";
@@ -72,13 +72,13 @@ void RGBController_PhilipsHueEntertainment::SetupZones()
     zone led_zone;
     led_zone.name       = "RGB Light";
     led_zone.type       = ZONE_TYPE_SINGLE;
-    led_zone.leds_min   = light->GetNumLEDs();
-    led_zone.leds_max   = light->GetNumLEDs();
-    led_zone.leds_count = light->GetNumLEDs();
+    led_zone.leds_min   = controller->GetNumLEDs();
+    led_zone.leds_max   = controller->GetNumLEDs();
+    led_zone.leds_count = controller->GetNumLEDs();
     led_zone.matrix_map = NULL;
     zones.push_back(led_zone);
 
-    for(unsigned int led_idx = 0; led_idx < light->GetNumLEDs(); led_idx++)
+    for(unsigned int led_idx = 0; led_idx < controller->GetNumLEDs(); led_idx++)
     {
         led new_led;
         new_led.name = "RGB Light";
@@ -102,7 +102,7 @@ void RGBController_PhilipsHueEntertainment::DeviceUpdateLEDs()
 
     if(active_mode == 0)
     {
-        light->SetColor(&colors[0]);
+        controller->SetColor(&colors[0]);
     }
 }
 
@@ -116,11 +116,6 @@ void RGBController_PhilipsHueEntertainment::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_PhilipsHueEntertainment::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_PhilipsHueEntertainment::DeviceUpdateMode()
 {
     if(active_mode == 0)
@@ -135,11 +130,11 @@ void RGBController_PhilipsHueEntertainment::DeviceUpdateMode()
             }
         }
 
-        light->Connect();
+        controller->Connect();
     }
     else
     {
-        light->Disconnect();
+        controller->Disconnect();
     }
 }
 
diff --git a/Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.h b/Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.h
@@ -17,23 +17,21 @@
 class RGBController_PhilipsHueEntertainment : public RGBController
 {
 public:
-    RGBController_PhilipsHueEntertainment(PhilipsHueEntertainmentController* light_ptr);
+    RGBController_PhilipsHueEntertainment(PhilipsHueEntertainmentController* controller_ptr);
 
     void        SetupZones();
-
     void        ResizeZone(int zone, int new_size);
 
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThreadFunction();
 
 private:
-    PhilipsHueEntertainmentController* light;
+    PhilipsHueEntertainmentController* controller;
 
     std::atomic<bool>   KeepaliveThreadRunning;
     std::thread*        KeepaliveThread;
diff --git a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp
@@ -19,17 +19,17 @@
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_PhilipsWiz::RGBController_PhilipsWiz(PhilipsWizController* light_ptr)
+RGBController_PhilipsWiz::RGBController_PhilipsWiz(PhilipsWizController* controller_ptr)
 {
-    light = light_ptr;
+    controller  = controller_ptr;
 
-    name        = light->GetManufacturer() + " " + light->GetName();
-    vendor      = light->GetManufacturer();
+    name        = controller->GetManufacturer() + " " + controller->GetName();
+    vendor      = controller->GetManufacturer();
     type        = DEVICE_TYPE_LIGHT;
-    version     = light->GetVersion();
+    version     = controller->GetVersion();
     description = "Philips Wiz Device";
-    serial      = light->GetUniqueID();
-    location    = light->GetLocation();
+    serial      = controller->GetUniqueID();
+    location    = controller->GetLocation();
 
     mode Direct;
     Direct.name       = "Direct";
@@ -43,7 +43,7 @@ RGBController_PhilipsWiz::RGBController_PhilipsWiz(PhilipsWizController* light_p
 
 RGBController_PhilipsWiz::~RGBController_PhilipsWiz()
 {
-    delete light;
+    delete controller;
 }
 
 void RGBController_PhilipsWiz::SetupZones()
@@ -78,7 +78,7 @@ void RGBController_PhilipsWiz::DeviceUpdateLEDs()
     unsigned char grn = RGBGetGValue(colors[0]);
     unsigned char blu = RGBGetBValue(colors[0]);
 
-    light->SetColor(red, grn, blu);
+    controller->SetColor(red, grn, blu);
 }
 
 void RGBController_PhilipsWiz::UpdateZoneLEDs(int /*zone*/)
@@ -91,11 +91,6 @@ void RGBController_PhilipsWiz::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_PhilipsWiz::SetCustomMode()
-{
-
-}
-
 void RGBController_PhilipsWiz::DeviceUpdateMode()
 {
 
diff --git a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.h b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.h
@@ -13,20 +13,18 @@
 class RGBController_PhilipsWiz : public RGBController
 {
 public:
-    RGBController_PhilipsWiz(PhilipsWizController* light_ptr);
+    RGBController_PhilipsWiz(PhilipsWizController* controller_ptr);
     ~RGBController_PhilipsWiz();
 
     void        SetupZones();
-
     void        ResizeZone(int zone, int new_size);
 
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
-    PhilipsWizController* light;
+    PhilipsWizController* controller;
 };

Original file line number	Diff line number	Diff line change
`@@ -212,11 +212,6 @@ void RGBController_PatriotViper::UpdateSingleLED(int led)`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`-void RGBController_PatriotViper::SetCustomMode()`
`216`		`-{`
`217`		`- active_mode = 0;`
`218`		`-}`
`219`		`-`
`220`	`215`	`void RGBController_PatriotViper::DeviceUpdateMode()`
`221`	`216`	`{`
`222`	`217`	`if(modes[active_mode].value == 0xFFFF)`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,6 @@ void RGBController_PatriotViperSteel::UpdateSingleLED(int led)`
`110`	`110`	`controller->SetLEDColor(led, red, grn, blu);`
`111`	`111`	`}`
`112`	`112`
`113`		`-void RGBController_PatriotViperSteel::SetCustomMode()`
`114`		`-{`
`115`		`-}`
`116`		`-`
`117`	`113`	`void RGBController_PatriotViperSteel::DeviceUpdateMode()`
`118`	`114`	`{`
`119`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,16 @@ using namespace std::chrono_literals;`
`23`	`23`	`@comment`
`24`	`24`	`\-------------------------------------------------------------------/`
`25`	`25`
`26`		`-RGBController_PhilipsHueEntertainment::RGBController_PhilipsHueEntertainment(PhilipsHueEntertainmentController* light_ptr)`
	`26`	`+RGBController_PhilipsHueEntertainment::RGBController_PhilipsHueEntertainment(PhilipsHueEntertainmentController* controller_ptr)`
`27`	`27`	`{`
`28`		`- light = light_ptr;`
	`28`	`+ controller = controller_ptr;`
`29`	`29`
`30`		`- name = light->GetManufacturer() + " " + light->GetName();`
	`30`	`+ name = controller->GetManufacturer() + " " + controller->GetName();`
`31`	`31`	`type = DEVICE_TYPE_LIGHT;`
`32`		`- version = light->GetVersion();`
	`32`	`+ version = controller->GetVersion();`
`33`	`33`	`description = "Philips Hue Entertainment Mode Device";`
`34`		`- serial = light->GetUniqueID();`
`35`		`- location = light->GetLocation();`
	`34`	`+ serial = controller->GetUniqueID();`
	`35`	`+ location = controller->GetLocation();`
`36`	`36`
`37`	`37`	`mode Direct;`
`38`	`38`	`Direct.name = "Direct";`
`@@ -72,13 +72,13 @@ void RGBController_PhilipsHueEntertainment::SetupZones()`
`72`	`72`	`zone led_zone;`
`73`	`73`	`led_zone.name = "RGB Light";`
`74`	`74`	`led_zone.type = ZONE_TYPE_SINGLE;`
`75`		`- led_zone.leds_min = light->GetNumLEDs();`
`76`		`- led_zone.leds_max = light->GetNumLEDs();`
`77`		`- led_zone.leds_count = light->GetNumLEDs();`
	`75`	`+ led_zone.leds_min = controller->GetNumLEDs();`
	`76`	`+ led_zone.leds_max = controller->GetNumLEDs();`
	`77`	`+ led_zone.leds_count = controller->GetNumLEDs();`
`78`	`78`	`led_zone.matrix_map = NULL;`
`79`	`79`	`zones.push_back(led_zone);`
`80`	`80`
`81`		`- for(unsigned int led_idx = 0; led_idx < light->GetNumLEDs(); led_idx++)`
	`81`	`+ for(unsigned int led_idx = 0; led_idx < controller->GetNumLEDs(); led_idx++)`
`82`	`82`	`{`
`83`	`83`	`led new_led;`
`84`	`84`	`new_led.name = "RGB Light";`
`@@ -102,7 +102,7 @@ void RGBController_PhilipsHueEntertainment::DeviceUpdateLEDs()`
`102`	`102`
`103`	`103`	`if(active_mode == 0)`
`104`	`104`	`{`
`105`		`- light->SetColor(&colors[0]);`
	`105`	`+ controller->SetColor(&colors[0]);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`@@ -116,11 +116,6 @@ void RGBController_PhilipsHueEntertainment::UpdateSingleLED(int /led/)`
`116`	`116`	`DeviceUpdateLEDs();`
`117`	`117`	`}`
`118`	`118`
`119`		`-void RGBController_PhilipsHueEntertainment::SetCustomMode()`
`120`		`-{`
`121`		`- active_mode = 0;`
`122`		`-}`
`123`		`-`
`124`	`119`	`void RGBController_PhilipsHueEntertainment::DeviceUpdateMode()`
`125`	`120`	`{`
`126`	`121`	`if(active_mode == 0)`
`@@ -135,11 +130,11 @@ void RGBController_PhilipsHueEntertainment::DeviceUpdateMode()`
`135`	`130`	`}`
`136`	`131`	`}`
`137`	`132`
`138`		`- light->Connect();`
	`133`	`+ controller->Connect();`
`139`	`134`	`}`
`140`	`135`	`else`
`141`	`136`	`{`
`142`		`- light->Disconnect();`
	`137`	`+ controller->Disconnect();`
`143`	`138`	`}`
`144`	`139`	`}`
`145`	`140`