Standardize common mouse zone/LED names

CalcProgrammer1 · CalcProgrammer1 · commit 346beed0eb84 · 2020-09-08T11:51:26.000-05:00
diff --git a/RGBController/RGBController_HoltekA070.cpp b/RGBController/RGBController_HoltekA070.cpp
@@ -38,7 +38,7 @@ RGBController_HoltekA070::RGBController_HoltekA070(HoltekA070Controller* holtek_
 void RGBController_HoltekA070::SetupZones()
 {
     zone mouse_zone;
-    mouse_zone.name          = "Mouse Zone";
+    mouse_zone.name          = "Mouse";
     mouse_zone.type          = ZONE_TYPE_SINGLE;
     mouse_zone.leds_min      = 1;
     mouse_zone.leds_max      = 1;
@@ -47,7 +47,7 @@ void RGBController_HoltekA070::SetupZones()
     zones.push_back(mouse_zone);
 
     led mouse_led;
-    mouse_led.name = "All LEDs";
+    mouse_led.name = "Mouse";
     leds.push_back(mouse_led);
 
     SetupColors();
diff --git a/RGBController/RGBController_HyperXPulsefireSurge.cpp b/RGBController/RGBController_HyperXPulsefireSurge.cpp
@@ -96,7 +96,12 @@ void RGBController_HyperXPulsefireSurge::SetupZones()
         for(unsigned int led_idx = 0; led_idx < zones[zone_idx].leds_count; led_idx++)
         {
             led new_led;
-            new_led.name = zones[zone_idx].name + " LED";
+            
+            if(zones[zone_idx].leds_count > 1)
+            {
+                new_led.name = zones[zone_idx].name + " LED";
+            }
+            
             leds.push_back(new_led);
         }
     }
diff --git a/RGBController/RGBController_LogitechG203.cpp b/RGBController/RGBController_LogitechG203.cpp
@@ -57,7 +57,7 @@ RGBController_LogitechG203::RGBController_LogitechG203(LogitechG203Controller* l
 void RGBController_LogitechG203::SetupZones()
 {
     zone g203_zone;
-    g203_zone.name           = "Mouse Zone";
+    g203_zone.name           = "Mouse";
     g203_zone.type           = ZONE_TYPE_SINGLE;
     g203_zone.leds_min       = 1;
     g203_zone.leds_max       = 1;
@@ -66,7 +66,7 @@ void RGBController_LogitechG203::SetupZones()
     zones.push_back(g203_zone);
 
     led g203_led;
-    g203_led.name = "Mouse LED";
+    g203_led.name = "Mouse";
     leds.push_back(g203_led);
 
     SetupColors();
diff --git a/RGBController/RGBController_LogitechG403.cpp b/RGBController/RGBController_LogitechG403.cpp
@@ -57,7 +57,7 @@ RGBController_LogitechG403::RGBController_LogitechG403(LogitechG403Controller* l
 void RGBController_LogitechG403::SetupZones()
 {
     zone G403_wheel_zone;
-    G403_wheel_zone.name           = "Mouse Wheel Zone";
+    G403_wheel_zone.name           = "Scroll Wheel";
     G403_wheel_zone.type           = ZONE_TYPE_SINGLE;
     G403_wheel_zone.leds_min       = 1;
     G403_wheel_zone.leds_max       = 1;
@@ -66,11 +66,11 @@ void RGBController_LogitechG403::SetupZones()
     zones.push_back(G403_wheel_zone);
 
     led G403_wheel_led;
-    G403_wheel_led.name = "Mouse Wheel LED";
+    G403_wheel_led.name = "Scroll Wheel";
     leds.push_back(G403_wheel_led);
 
     zone G403_logo_zone;
-    G403_logo_zone.name           = "Logo Zone";
+    G403_logo_zone.name           = "Logo";
     G403_logo_zone.type           = ZONE_TYPE_SINGLE;
     G403_logo_zone.leds_min       = 1;
     G403_logo_zone.leds_max       = 1;
@@ -79,7 +79,7 @@ void RGBController_LogitechG403::SetupZones()
     zones.push_back(G403_logo_zone);
 
     led G403_logo_led;
-    G403_logo_led.name = "Logo LED";
+    G403_logo_led.name = "Logo";
     leds.push_back(G403_logo_led);
 
     SetupColors();
diff --git a/RGBController/RGBController_LogitechG502PS.cpp b/RGBController/RGBController_LogitechG502PS.cpp
@@ -57,7 +57,7 @@ RGBController_LogitechG502PS::RGBController_LogitechG502PS(LogitechG502PSControl
 void RGBController_LogitechG502PS::SetupZones()
 {
     zone G502_PS_side_zone;
-    G502_PS_side_zone.name           = "Mouse Side Zone";
+    G502_PS_side_zone.name           = "DPI";
     G502_PS_side_zone.type           = ZONE_TYPE_SINGLE;
     G502_PS_side_zone.leds_min       = 1;
     G502_PS_side_zone.leds_max       = 1;
@@ -66,11 +66,11 @@ void RGBController_LogitechG502PS::SetupZones()
     zones.push_back(G502_PS_side_zone);
 
     led G502_PS_side_led;
-    G502_PS_side_led.name = "Mouse Wheel LED";
+    G502_PS_side_led.name = "DPI";
     leds.push_back(G502_PS_side_led);
 
     zone G502_logo_zone;
-    G502_logo_zone.name           = "Logo Zone";
+    G502_logo_zone.name           = "Logo";
     G502_logo_zone.type           = ZONE_TYPE_SINGLE;
     G502_logo_zone.leds_min       = 1;
     G502_logo_zone.leds_max       = 1;
@@ -79,7 +79,7 @@ void RGBController_LogitechG502PS::SetupZones()
     zones.push_back(G502_logo_zone);
 
     led G502_logo_led;
-    G502_logo_led.name = "Logo LED";
+    G502_logo_led.name = "Logo";
     leds.push_back(G502_logo_led);
 
     SetupColors();
diff --git a/RGBController/RGBController_LogitechGPowerPlay.cpp b/RGBController/RGBController_LogitechGPowerPlay.cpp
@@ -57,7 +57,7 @@ RGBController_LogitechGPowerPlay::RGBController_LogitechGPowerPlay(LogitechGPowe
 void RGBController_LogitechGPowerPlay::SetupZones()
 {
     zone GPowerPlay_logo_zone;
-    GPowerPlay_logo_zone.name           = "Logo Zone";
+    GPowerPlay_logo_zone.name           = "Logo";
     GPowerPlay_logo_zone.type           = ZONE_TYPE_SINGLE;
     GPowerPlay_logo_zone.leds_min       = 1;
     GPowerPlay_logo_zone.leds_max       = 1;
@@ -66,7 +66,7 @@ void RGBController_LogitechGPowerPlay::SetupZones()
     zones.push_back(GPowerPlay_logo_zone);
 
     led GPowerPlay_logo_led;
-    GPowerPlay_logo_led.name = "Logo LED";
+    GPowerPlay_logo_led.name = "Logo";
     leds.push_back(GPowerPlay_logo_led);
 
     SetupColors();
diff --git a/RGBController/RGBController_LogitechGProWireless.cpp b/RGBController/RGBController_LogitechGProWireless.cpp
@@ -57,7 +57,7 @@ RGBController_LogitechGProWireless::RGBController_LogitechGProWireless(LogitechG
 void RGBController_LogitechGProWireless::SetupZones()
 {
     zone GProWireless_primary_zone;
-    GProWireless_primary_zone.name           = "DPI Zone";
+    GProWireless_primary_zone.name           = "DPI";
     GProWireless_primary_zone.type           = ZONE_TYPE_SINGLE;
     GProWireless_primary_zone.leds_min       = 1;
     GProWireless_primary_zone.leds_max       = 1;
@@ -66,11 +66,11 @@ void RGBController_LogitechGProWireless::SetupZones()
     zones.push_back(GProWireless_primary_zone);
 
     led GProWireless_primary_led;
-    GProWireless_primary_led.name = "DPI LED";
+    GProWireless_primary_led.name = "DPI";
     leds.push_back(GProWireless_primary_led);
 
     zone GProWireless_logo_zone;
-    GProWireless_logo_zone.name           = "Logo Zone";
+    GProWireless_logo_zone.name           = "Logo";
     GProWireless_logo_zone.type           = ZONE_TYPE_SINGLE;
     GProWireless_logo_zone.leds_min       = 1;
     GProWireless_logo_zone.leds_max       = 1;
@@ -79,7 +79,7 @@ void RGBController_LogitechGProWireless::SetupZones()
     zones.push_back(GProWireless_logo_zone);
 
     led GProWireless_logo_led;
-    GProWireless_logo_led.name = "Logo LED";
+    GProWireless_logo_led.name = "Logo";
     leds.push_back(GProWireless_logo_led);
 
     SetupColors();
diff --git a/RGBController/RGBController_OpenRazer.cpp b/RGBController/RGBController_OpenRazer.cpp
@@ -424,8 +424,13 @@ void RGBController_OpenRazer::SetupZones()
             {
                 led* new_led = new led();
 
-                new_led->name = device_list[device_index]->zones[zone_id]->name + " LED ";
-                new_led->name.append(std::to_string(col_id + 1));
+                new_led->name = device_list[device_index]->zones[zone_id]->name;
+
+                if(zones[zone_id].leds_count > 1)
+                {
+                    new_led->name.append(" LED ");
+                    new_led->name.append(std::to_string(col_id + 1));
+                }  
 
                 if(device_list[device_index]->keymap != NULL)
                 {
diff --git a/RGBController/RGBController_OpenRazerWindows.cpp b/RGBController/RGBController_OpenRazerWindows.cpp
@@ -371,8 +371,13 @@ void RGBController_OpenRazer::SetupZones()
             {
                 led* new_led = new led();
 
-                new_led->name = device_list[device_index]->zones[zone_id]->name + " LED ";
-                new_led->name.append(std::to_string(col_id + 1));
+                new_led->name = device_list[device_index]->zones[zone_id]->name;
+                
+                if(zones[zone_id].leds_count > 1)
+                {
+                    new_led->name.append(" LED ");
+                    new_led->name.append(std::to_string(col_id + 1));
+                }                
 
                 if(device_list[device_index]->keymap != NULL)
                 {
diff --git a/RGBController/RGBController_RedragonM711.cpp b/RGBController/RGBController_RedragonM711.cpp
@@ -58,7 +58,7 @@ RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* r
 void RGBController_RedragonM711::SetupZones()
 {
     zone m711_zone;
-    m711_zone.name           = "Mouse Zone";
+    m711_zone.name           = "Mouse";
     m711_zone.type           = ZONE_TYPE_SINGLE;
     m711_zone.leds_min       = 1;
     m711_zone.leds_max       = 1;
@@ -67,7 +67,7 @@ void RGBController_RedragonM711::SetupZones()
     zones.push_back(m711_zone);
 
     led m711_led;
-    m711_led.name = "Mouse LED";
+    m711_led.name = "Mouse";
     leds.push_back(m711_led);
 
     SetupColors();
diff --git a/RGBController/RGBController_SteelSeriesRival.cpp b/RGBController/RGBController_SteelSeriesRival.cpp
@@ -50,13 +50,13 @@ void RGBController_SteelSeriesRival::SetupZones()
     zones.push_back(logo_zone);
 
     led logo_led;
-    logo_led.name = "Logo LED";
+    logo_led.name = "Logo";
     leds.push_back(logo_led);
 
     /* Rival 300 extends this by adding another LED + Zone */
     if (rival->GetMouseType() == RIVAL_300) {
         zone wheel_zone;
-        wheel_zone.name         = "Wheel";
+        wheel_zone.name         = "Scroll Wheel";
         wheel_zone.type         = ZONE_TYPE_SINGLE;
         wheel_zone.leds_min     = 1;
         wheel_zone.leds_max     = 1;
@@ -65,7 +65,7 @@ void RGBController_SteelSeriesRival::SetupZones()
         zones.push_back(wheel_zone);
         
         led wheel_led;
-        wheel_led.name = "Wheel LED";
+        wheel_led.name = "Scroll Wheel";
         leds.push_back(wheel_led);
     }
     SetupColors();
diff --git a/RGBController/RGBController_Tecknet.cpp b/RGBController/RGBController_Tecknet.cpp
@@ -60,7 +60,7 @@ RGBController_Tecknet::~RGBController_Tecknet()
 void RGBController_Tecknet::SetupZones()
 {
     zone Tecknet_zone;
-    Tecknet_zone.name          = "Tecknet Logo";
+    Tecknet_zone.name          = "Logo";
     Tecknet_zone.type          = ZONE_TYPE_SINGLE;
     Tecknet_zone.leds_min      = 1;
     Tecknet_zone.leds_max      = 1;
@@ -69,7 +69,7 @@ void RGBController_Tecknet::SetupZones()
     zones.push_back(Tecknet_zone);
 
     led Tecknet_led;
-    Tecknet_led.name = "Logo LED";
+    Tecknet_led.name = "Logo";
     leds.push_back(Tecknet_led);
 
     SetupColors();

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,12 @@ void RGBController_HyperXPulsefireSurge::SetupZones()`
`96`	`96`	`for(unsigned int led_idx = 0; led_idx < zones[zone_idx].leds_count; led_idx++)`
`97`	`97`	`{`
`98`	`98`	`led new_led;`
`99`		`- new_led.name = zones[zone_idx].name + " LED";`
	`99`	`+`
	`100`	`+ if(zones[zone_idx].leds_count > 1)`
	`101`	`+ {`
	`102`	`+ new_led.name = zones[zone_idx].name + " LED";`
	`103`	`+ }`
	`104`	`+`
`100`	`105`	`leds.push_back(new_led);`
`101`	`106`	`}`
`102`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -424,8 +424,13 @@ void RGBController_OpenRazer::SetupZones()`
`424`	`424`	`{`
`425`	`425`	`led* new_led = new led();`
`426`	`426`
`427`		`- new_led->name = device_list[device_index]->zones[zone_id]->name + " LED ";`
`428`		`- new_led->name.append(std::to_string(col_id + 1));`
	`427`	`+ new_led->name = device_list[device_index]->zones[zone_id]->name;`
	`428`	`+`
	`429`	`+ if(zones[zone_id].leds_count > 1)`
	`430`	`+ {`
	`431`	`+ new_led->name.append(" LED ");`
	`432`	`+ new_led->name.append(std::to_string(col_id + 1));`
	`433`	`+ }`
`429`	`434`
`430`	`435`	`if(device_list[device_index]->keymap != NULL)`
`431`	`436`	`{`
Original file line number	Diff line number	Diff line change
`@@ -371,8 +371,13 @@ void RGBController_OpenRazer::SetupZones()`
`371`	`371`	`{`
`372`	`372`	`led* new_led = new led();`
`373`	`373`
`374`		`- new_led->name = device_list[device_index]->zones[zone_id]->name + " LED ";`
`375`		`- new_led->name.append(std::to_string(col_id + 1));`
	`374`	`+ new_led->name = device_list[device_index]->zones[zone_id]->name;`
	`375`	`+`
	`376`	`+ if(zones[zone_id].leds_count > 1)`
	`377`	`+ {`
	`378`	`+ new_led->name.append(" LED ");`
	`379`	`+ new_led->name.append(std::to_string(col_id + 1));`
	`380`	`+ }`
`376`	`381`
`377`	`382`	`if(device_list[device_index]->keymap != NULL)`
`378`	`383`	`{`