Skip to content

Commit be90537

Browse files
Fix warnings
1 parent 755ce20 commit be90537

12 files changed

Lines changed: 44 additions & 44 deletions

File tree

Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,12 @@ void RGBController_AMDWraithPrism::DeviceUpdateLEDs()
262262
}
263263
}
264264

265-
void RGBController_AMDWraithPrism::UpdateZoneLEDs(int zone)
265+
void RGBController_AMDWraithPrism::UpdateZoneLEDs(int /*zone*/)
266266
{
267267
DeviceUpdateLEDs();
268268
}
269269

270-
void RGBController_AMDWraithPrism::UpdateSingleLED(int led)
270+
void RGBController_AMDWraithPrism::UpdateSingleLED(int /*led*/)
271271
{
272272
DeviceUpdateLEDs();
273273
}

Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ std::string AuraTUFKeyboardController::GetVersion()
7777
{
7878
snprintf(version, 9, "%02X.%02X.%02X", usb_buf_out[5], usb_buf_out[6], usb_buf_out[7]);
7979
}
80-
80+
8181
return std::string(version);
8282
}
8383
else
@@ -111,7 +111,7 @@ std::string AuraTUFKeyboardController::GetVersion()
111111

112112
char version[9];
113113
snprintf(version, 9, "%02X.%02X.%02X", usb_buf_out[8], usb_buf_out[9], usb_buf_out[10]);
114-
114+
115115
return std::string(version);
116116
}
117117
}
@@ -137,12 +137,12 @@ int AuraTUFKeyboardController::GetLayout()
137137
}
138138
else
139139
{
140-
char layout[] = "";
141-
140+
char layout[4];
141+
142142
sprintf(layout, "%X", version);
143143

144144
int layoutnum = std::stoi(std::string(layout, 1));
145-
145+
146146
switch(layoutnum)
147147
{
148148
case 1:
@@ -276,14 +276,14 @@ void AuraTUFKeyboardController::UpdateLeds
276276
usb_buf[3] = leds;
277277
usb_buf[4] = 0x00;
278278

279-
for(unsigned int j = 0; j < leds; j++)
279+
for(int j = 0; j < leds; j++)
280280
{
281281
usb_buf[j * 4 + 5] = colors[i * 15 + j].value;
282282
usb_buf[j * 4 + 6] = RGBGetRValue(colors[i * 15 + j].color);
283283
usb_buf[j * 4 + 7] = RGBGetGValue(colors[i * 15 + j].color);
284284
usb_buf[j * 4 + 8] = RGBGetBValue(colors[i * 15 + j].color);
285285
}
286-
286+
287287
ClearResponses();
288288

289289
hid_write(dev, usb_buf, 65);
@@ -352,7 +352,7 @@ void AuraTUFKeyboardController::UpdateDevice
352352
usb_buf[12 + i * 3] = RGBGetBValue(colors[i]);
353353
}
354354
}
355-
355+
356356
}
357357
}
358358
else

Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RGBController_AuraTUFKeyboard::RGBController_AuraTUFKeyboard(AuraTUFKeyboardCont
2828

2929
pid = controller->device_pid;
3030

31-
if(pid != AURA_ROG_CLAYMORE_PID)
31+
if(pid != AURA_ROG_CLAYMORE_PID)
3232
{
3333
name = "ASUS Aura Keyboard";
3434
vendor = "ASUS";
@@ -398,7 +398,7 @@ void RGBController_AuraTUFKeyboard::SetupZones()
398398
keyboard_zone.matrix_map->map = keyboard[layout].matrix_map;
399399
zones.push_back(keyboard_zone);
400400

401-
for(unsigned int led_id = 0; led_id < keyboard[layout].size; led_id++)
401+
for(int led_id = 0; led_id < keyboard[layout].size; led_id++)
402402
{
403403
led new_led;
404404
new_led.name = keyboard[layout].led_names[led_id].name;
@@ -423,7 +423,7 @@ void RGBController_AuraTUFKeyboard::DeviceUpdateLEDs()
423423
{
424424
std::vector<led_color> led_color_list = {};
425425

426-
for(int i = 0; i < colors.size(); i++)
426+
for(unsigned int i = 0; i < colors.size(); i++)
427427
{
428428
led_color_list.push_back({ leds[i].value, colors[i] });
429429
}
@@ -448,13 +448,13 @@ void RGBController_AuraTUFKeyboard::UpdateSingleLED(int led)
448448

449449
static const uint8_t direction_map[2][6] =
450450
{
451-
{ 4, 0, 6, 2, 8, 1 }, // Default directions Left, Right, Up, Down, Horizontal, Vertical
451+
{ 4, 0, 6, 2, 8, 1 }, // Default directions Left, Right, Up, Down, Horizontal, Vertical
452452
{ 0, 4, 6, 2, 0xFF, 0xFF }, // AURA_ROG_CLAYMORE directions Left, Right, Up, Down
453453
};
454454

455455
void RGBController_AuraTUFKeyboard::DeviceUpdateMode()
456456
{
457-
if(pid == AURA_ROG_CLAYMORE_PID)
457+
if(pid == AURA_ROG_CLAYMORE_PID)
458458
{
459459
controller->AllowRemoteControl(1);
460460
}
@@ -468,7 +468,7 @@ void RGBController_AuraTUFKeyboard::DeviceUpdateMode()
468468
if(pid == AURA_ROG_CLAYMORE_PID) controller->AllowRemoteControl(3);
469469
return;
470470
};
471-
471+
472472
if(pid != AURA_ROG_CLAYMORE_PID)
473473
{
474474
brightness = modes[active_mode].brightness * 25;
@@ -521,7 +521,7 @@ void RGBController_AuraTUFKeyboard::DeviceUpdateMode()
521521

522522
controller->UpdateDevice(modes[active_mode].value, std::vector<RGBColor>(modes[active_mode].colors), direction, color_mode, modes[active_mode].speed, brightness);
523523

524-
if(pid == AURA_ROG_CLAYMORE_PID)
524+
if(pid == AURA_ROG_CLAYMORE_PID)
525525
{
526526
controller->UpdateMode(modes[active_mode].value);
527527
controller->SaveMode();
@@ -534,7 +534,7 @@ void RGBController_AuraTUFKeyboard::DeviceSaveMode()
534534
/*----------------------------------------------------------*\
535535
| not available for Claymore |
536536
\*----------------------------------------------------------*/
537-
if(pid != AURA_ROG_CLAYMORE_PID)
537+
if(pid != AURA_ROG_CLAYMORE_PID)
538538
{
539539
DeviceUpdateMode();
540540
controller->SaveMode();

Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ std::string AsusCerberusKeyboardController::GetSerialString()
5454

5555
std::string AsusCerberusKeyboardController::GetVersion()
5656
{
57-
char versionstr[] = "";
57+
char versionstr[5];
5858
snprintf(versionstr, 3, "%X", version);
5959
return(std::string(versionstr, 3));
6060
}

Controllers/AsusLegacyUSBController/RGBController_AsusCerberusKeyboard.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ void RGBController_AsusCerberusKeyboard::SetupZones()
301301
keyboard.matrix_map->map = *matrix_map;
302302
zones.push_back(keyboard);
303303

304-
for(unsigned int led_id = 0; led_id < zone_size; led_id++)
304+
for(int led_id = 0; led_id < zone_size; led_id++)
305305
{
306306
led new_led;
307307
new_led.name = led_names[led_id].name;
@@ -320,7 +320,7 @@ void RGBController_AsusCerberusKeyboard::ResizeZone(int /*zone*/, int /*new_size
320320

321321
void RGBController_AsusCerberusKeyboard::DeviceUpdateLEDs()
322322
{
323-
for(int i = 0; i < colors.size(); i++)
323+
for(unsigned int i = 0; i < colors.size(); i++)
324324
{
325325
uint8_t red = RGBGetRValue(colors[i]);
326326
uint8_t green = RGBGetGValue(colors[i]);

Controllers/IntelArcA770LEController/RGBController_IntelArcA770LE.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ void RGBController_IntelArcA770LE::DeviceUpdateLEDs()
188188
}
189189
}
190190

191-
void RGBController_IntelArcA770LE::UpdateZoneLEDs(int zone)
191+
void RGBController_IntelArcA770LE::UpdateZoneLEDs(int /*zone*/)
192192
{
193193

194194
}
195195

196-
void RGBController_IntelArcA770LE::UpdateSingleLED(int led)
196+
void RGBController_IntelArcA770LE::UpdateSingleLED(int /*led*/)
197197
{
198198
}
199199

Controllers/LenovoControllers/RGBController_LenovoUSB.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@ RGBController_LenovoUSB::RGBController_LenovoUSB(LenovoUSBController* controller
6969
}
7070

7171
std::vector<uint8_t> response;
72+
73+
/*-----------------------*\
74+
|Default to ANSI keyboard |
75+
\*-----------------------*/
76+
keyboard_type = ANSI;
77+
7278
switch(controller->getPid())
7379
{
74-
/*-----------------------*\
75-
|Default to ANSI keyboard |
76-
\*-----------------------*/
77-
keyboard_type = ANSI;
78-
7980
case LEGION_Y740:
8081
response = controller->getInformation(0x01);
8182
if(response.size() > 4 && response[4] <= 100)

Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void RGBController_RoccatVulcanAimo::SetupZones()
100100
keyboard_zone.matrix_map->map = RoccatVulcanLayouts[layout].matrix_map;
101101
zones.push_back(keyboard_zone);
102102

103-
for(unsigned int led_id = 0; led_id < RoccatVulcanLayouts[layout].size; led_id++)
103+
for(int led_id = 0; led_id < RoccatVulcanLayouts[layout].size; led_id++)
104104
{
105105
led new_led;
106106
new_led.name = RoccatVulcanLayouts[layout].led_names[led_id].name;
@@ -129,7 +129,7 @@ void RGBController_RoccatVulcanAimo::DeviceUpdateLEDs()
129129
{
130130
std::vector<led_color> led_color_list = {};
131131

132-
for(int i = 0; i < colors.size(); i++)
132+
for(unsigned int i = 0; i < colors.size(); i++)
133133
{
134134
led_color_list.push_back({ leds[i].value, colors[i] });
135135
}
@@ -158,7 +158,7 @@ void RGBController_RoccatVulcanAimo::DeviceUpdateMode()
158158

159159
if(modes[active_mode].value == ROCCAT_VULCAN_MODE_STATIC)
160160
{
161-
for(int i = 0; i < colors.size(); i++)
161+
for(unsigned int i = 0; i < colors.size(); i++)
162162
{
163163
led_color_list.push_back({ leds[i].value, colors[i] });
164164
}

Controllers/RoccatController/RoccatVulcanAimoController.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void RoccatVulcanAimoController::SendColors(std::vector<led_color> colors)
8181
bufs[0][3] = 0x01;
8282
bufs[0][4] = 0xB4;
8383

84-
for(int i = 0; i < colors.size(); i++)
84+
for(unsigned int i = 0; i < colors.size(); i++)
8585
{
8686
int coloumn = floor(colors[i].value / 12);
8787
int row = colors[i].value % 12;
@@ -127,7 +127,7 @@ void RoccatVulcanAimoController::SendMode(unsigned int mode, unsigned int speed,
127127
if(mode == ROCCAT_VULCAN_MODE_STATIC)
128128
{
129129

130-
for(int i = 0; i < colors.size(); i++)
130+
for(unsigned int i = 0; i < colors.size(); i++)
131131
{
132132
int coloumn = floor(colors[i].value / 12);
133133
int row = colors[i].value % 12;

Controllers/SinowealthController/SinowealthControllerDetect.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -395,15 +395,14 @@ void DetectSinowealthGenesisKeyboard(hid_device_info* info, const std::string& n
395395
hid_device* dev = hid_open_path(info->path);
396396
if(dev)
397397
{
398-
RGBController *rgb_controller;
399-
400398
if(pid == GENESIS_THOR_300_PID)
401399
{
402-
SinowealthKeyboard90Controller* controller = new SinowealthKeyboard90Controller(dev, info->path, pid);
403-
rgb_controller = new RGBController_SinowealthKeyboard90(controller);
400+
SinowealthKeyboard90Controller* controller = new SinowealthKeyboard90Controller(dev, info->path, pid);
401+
RGBController_SinowealthKeyboard90* rgb_controller = new RGBController_SinowealthKeyboard90(controller);
402+
rgb_controller->name = name;
403+
404+
ResourceManager::get()->RegisterRGBController(rgb_controller);
404405
}
405-
rgb_controller->name = name;
406-
ResourceManager::get()->RegisterRGBController(rgb_controller);
407406
}
408407
}
409408

0 commit comments

Comments
 (0)