Skip to content

Commit 06c4d8a

Browse files
CalcProgrammer1CalcProgrammer1
committed
Fix signedness comparison warning in RGBController_AsusSagarisKeyboard.cpp
1 parent e9b3507 commit 06c4d8a

File tree

1 file changed

+96
-93
lines changed

1 file changed

+96
-93
lines changed

‎Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp‎

Lines changed: 96 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -26,129 +26,129 @@
2626

2727
RGBController_AsusSagarisKeyboard::RGBController_AsusSagarisKeyboard(AsusSagarisKeyboardController* controller_ptr)
2828
{
29-
controller = controller_ptr;
29+
controller = controller_ptr;
3030

31-
name = "ASUS Sagaris Keyboard";
32-
vendor = "ASUS";
33-
type = DEVICE_TYPE_KEYBOARD;
34-
description = "ASUS Sagaris Keyboard Device";
35-
version = controller->GetVersion();
36-
location = controller->GetDeviceLocation();
37-
serial = controller->GetSerialString();
31+
name = "ASUS Sagaris Keyboard";
32+
vendor = "ASUS";
33+
type = DEVICE_TYPE_KEYBOARD;
34+
description = "ASUS Sagaris Keyboard Device";
35+
version = controller->GetVersion();
36+
location = controller->GetDeviceLocation();
37+
serial = controller->GetSerialString();
3838

3939
mode Off;
40-
Off.name = "Off";
41-
Off.value = SAGARIS_KEYBOARD_MODE_OFF;
42-
Off.flags = MODE_FLAG_AUTOMATIC_SAVE;
43-
Off.color_mode = MODE_COLORS_NONE;
40+
Off.name = "Off";
41+
Off.value = SAGARIS_KEYBOARD_MODE_OFF;
42+
Off.flags = MODE_FLAG_AUTOMATIC_SAVE;
43+
Off.color_mode = MODE_COLORS_NONE;
4444
modes.push_back(Off);
4545

4646
mode Static;
47-
Static.name = "Static";
48-
Static.value = SAGARIS_KEYBOARD_MODE_STATIC;
49-
Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
50-
Static.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
51-
Static.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
52-
Static.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
53-
Static.color_mode = MODE_COLORS_MODE_SPECIFIC;
54-
Static.colors_min = 1;
55-
Static.colors_max = 1;
47+
Static.name = "Static";
48+
Static.value = SAGARIS_KEYBOARD_MODE_STATIC;
49+
Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
50+
Static.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
51+
Static.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
52+
Static.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
53+
Static.color_mode = MODE_COLORS_MODE_SPECIFIC;
54+
Static.colors_min = 1;
55+
Static.colors_max = 1;
5656
Static.colors.resize(1);
5757
modes.push_back(Static);
5858

5959
mode Spiral;
60-
Spiral.name = "Spiral";
61-
Spiral.value = SAGARIS_KEYBOARD_MODE_SPRIAL;
62-
Spiral.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
63-
Spiral.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
64-
Spiral.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
65-
Spiral.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
66-
Spiral.speed_min = SAGARIS_KEYBOARD_SPEED_MIN;
67-
Spiral.speed_max = SAGARIS_KEYBOARD_SPEED_MAX;
68-
Spiral.speed = SAGARIS_KEYBOARD_SPEED_DEFAULT;
69-
Spiral.color_mode = MODE_COLORS_MODE_SPECIFIC;
70-
Spiral.colors_min = 7;
71-
Spiral.colors_max = 7;
60+
Spiral.name = "Spiral";
61+
Spiral.value = SAGARIS_KEYBOARD_MODE_SPRIAL;
62+
Spiral.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
63+
Spiral.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
64+
Spiral.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
65+
Spiral.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
66+
Spiral.speed_min = SAGARIS_KEYBOARD_SPEED_MIN;
67+
Spiral.speed_max = SAGARIS_KEYBOARD_SPEED_MAX;
68+
Spiral.speed = SAGARIS_KEYBOARD_SPEED_DEFAULT;
69+
Spiral.color_mode = MODE_COLORS_MODE_SPECIFIC;
70+
Spiral.colors_min = 7;
71+
Spiral.colors_max = 7;
7272
Spiral.colors.resize(7);
7373
modes.push_back(Spiral);
7474

7575
mode Custom;
76-
Custom.name = "Custom";
77-
Custom.value = SAGARIS_KEYBOARD_MODE_CUSTOM;
78-
Custom.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
79-
Custom.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
80-
Custom.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
81-
Custom.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
82-
Custom.color_mode = MODE_COLORS_MODE_SPECIFIC;
83-
Custom.colors_min = 7;
84-
Custom.colors_max = 7;
76+
Custom.name = "Custom";
77+
Custom.value = SAGARIS_KEYBOARD_MODE_CUSTOM;
78+
Custom.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS;
79+
Custom.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
80+
Custom.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
81+
Custom.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
82+
Custom.color_mode = MODE_COLORS_MODE_SPECIFIC;
83+
Custom.colors_min = 7;
84+
Custom.colors_max = 7;
8585
Custom.colors.resize(7);
8686
modes.push_back(Custom);
8787

8888
mode Breathing;
89-
Breathing.name = "Breathing";
90-
Breathing.value = SAGARIS_KEYBOARD_MODE_BREATHING;
91-
Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_SPEED;
92-
Breathing.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
93-
Breathing.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
94-
Breathing.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
95-
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
96-
Breathing.colors_min = 7;
97-
Breathing.colors_max = 7;
89+
Breathing.name = "Breathing";
90+
Breathing.value = SAGARIS_KEYBOARD_MODE_BREATHING;
91+
Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_SPEED;
92+
Breathing.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
93+
Breathing.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
94+
Breathing.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
95+
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
96+
Breathing.colors_min = 7;
97+
Breathing.colors_max = 7;
9898
Breathing.colors.resize(7);
9999
modes.push_back(Breathing);
100100

101101
mode Reactive;
102-
Reactive.name = "Reactive";
103-
Reactive.value = SAGARIS_KEYBOARD_MODE_REACTIVE;
104-
Reactive.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
105-
Reactive.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
106-
Reactive.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
107-
Reactive.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
108-
Reactive.speed_min = SAGARIS_KEYBOARD_SPEED_MIN;
109-
Reactive.speed_max = SAGARIS_KEYBOARD_SPEED_MAX;
110-
Reactive.speed = SAGARIS_KEYBOARD_SPEED_DEFAULT;
111-
Reactive.color_mode = MODE_COLORS_MODE_SPECIFIC;
112-
Reactive.colors_min = 1;
113-
Reactive.colors_max = 1;
102+
Reactive.name = "Reactive";
103+
Reactive.value = SAGARIS_KEYBOARD_MODE_REACTIVE;
104+
Reactive.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
105+
Reactive.brightness_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
106+
Reactive.brightness_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
107+
Reactive.brightness = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
108+
Reactive.speed_min = SAGARIS_KEYBOARD_SPEED_MIN;
109+
Reactive.speed_max = SAGARIS_KEYBOARD_SPEED_MAX;
110+
Reactive.speed = SAGARIS_KEYBOARD_SPEED_DEFAULT;
111+
Reactive.color_mode = MODE_COLORS_MODE_SPECIFIC;
112+
Reactive.colors_min = 1;
113+
Reactive.colors_max = 1;
114114
Reactive.colors.resize(1);
115115
modes.push_back(Reactive);
116116

117117
mode Starry_Night;
118-
Starry_Night.name = "Starry Night";
119-
Starry_Night.value = SAGARIS_KEYBOARD_MODE_STARRY_NIGHT;
120-
Starry_Night.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
121-
Starry_Night.brightness_min = SAGARIS_KEYBOARD_SPEED_MIN;
122-
Starry_Night.brightness_max = SAGARIS_KEYBOARD_SPEED_MAX;
123-
Starry_Night.brightness = SAGARIS_KEYBOARD_SPEED_DEFAULT;
124-
Starry_Night.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
125-
Starry_Night.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
126-
Starry_Night.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
127-
Starry_Night.color_mode = MODE_COLORS_MODE_SPECIFIC;
128-
Starry_Night.colors_min = 7;
129-
Starry_Night.colors_max = 7;
118+
Starry_Night.name = "Starry Night";
119+
Starry_Night.value = SAGARIS_KEYBOARD_MODE_STARRY_NIGHT;
120+
Starry_Night.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
121+
Starry_Night.brightness_min = SAGARIS_KEYBOARD_SPEED_MIN;
122+
Starry_Night.brightness_max = SAGARIS_KEYBOARD_SPEED_MAX;
123+
Starry_Night.brightness = SAGARIS_KEYBOARD_SPEED_DEFAULT;
124+
Starry_Night.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
125+
Starry_Night.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
126+
Starry_Night.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
127+
Starry_Night.color_mode = MODE_COLORS_MODE_SPECIFIC;
128+
Starry_Night.colors_min = 7;
129+
Starry_Night.colors_max = 7;
130130
Starry_Night.colors.resize(7);
131131
modes.push_back(Starry_Night);
132132

133133
mode Laser;
134-
Laser.name = "Laser";
135-
Laser.value = SAGARIS_KEYBOARD_MODE_LASER;
136-
Laser.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
137-
Laser.brightness_min = SAGARIS_KEYBOARD_SPEED_MIN;
138-
Laser.brightness_max = SAGARIS_KEYBOARD_SPEED_MAX;
139-
Laser.brightness = SAGARIS_KEYBOARD_SPEED_DEFAULT;
140-
Laser.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
141-
Laser.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
142-
Laser.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
143-
Laser.color_mode = MODE_COLORS_MODE_SPECIFIC;
144-
Laser.colors_min = 7;
145-
Laser.colors_max = 7;
134+
Laser.name = "Laser";
135+
Laser.value = SAGARIS_KEYBOARD_MODE_LASER;
136+
Laser.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_AUTOMATIC_SAVE | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
137+
Laser.brightness_min = SAGARIS_KEYBOARD_SPEED_MIN;
138+
Laser.brightness_max = SAGARIS_KEYBOARD_SPEED_MAX;
139+
Laser.brightness = SAGARIS_KEYBOARD_SPEED_DEFAULT;
140+
Laser.speed_min = SAGARIS_KEYBOARD_BRIGHTNESS_MIN;
141+
Laser.speed_max = SAGARIS_KEYBOARD_BRIGHTNESS_MAX;
142+
Laser.speed = SAGARIS_KEYBOARD_BRIGHTNESS_DEFAULT;
143+
Laser.color_mode = MODE_COLORS_MODE_SPECIFIC;
144+
Laser.colors_min = 7;
145+
Laser.colors_max = 7;
146146
Laser.colors.resize(7);
147147
modes.push_back(Laser);
148148

149149
SetupZones();
150150

151-
sagaris_mode current_mode = controller->GetMode();
151+
sagaris_mode current_mode = controller->GetMode();
152152

153153
active_mode = current_mode.mode;
154154
last_mode = current_mode.mode;
@@ -157,7 +157,7 @@ RGBController_AsusSagarisKeyboard::RGBController_AsusSagarisKeyboard(AsusSagaris
157157

158158
current_colors = controller->GetColors();
159159

160-
for(int i = 0; i < modes[active_mode].colors.size(); i++)
160+
for(unsigned int i = 0; i < modes[active_mode].colors.size(); i++)
161161
{
162162
modes[active_mode].colors[i] = current_colors[i];
163163
}
@@ -206,19 +206,19 @@ void RGBController_AsusSagarisKeyboard::DeviceUpdateMode()
206206
if(last_mode != active_mode)
207207
{
208208
last_mode = active_mode;
209-
for(int i = 0; i < modes[active_mode].colors.size(); i++)
209+
for(unsigned int i = 0; i < modes[active_mode].colors.size(); i++)
210210
{
211211
modes[active_mode].colors[i] = current_colors[i];
212212
}
213213
}
214214
else
215215
{
216-
for(int i = 0; i < modes[active_mode].colors.size(); i++)
216+
for(unsigned int i = 0; i < modes[active_mode].colors.size(); i++)
217217
{
218218
current_colors[i] = modes[active_mode].colors[i];
219219
}
220220

221-
for(int i = 0; i < modes[active_mode].colors.size(); i++)
221+
for(unsigned int i = 0; i < modes[active_mode].colors.size(); i++)
222222
{
223223
/*-----------------------------------------*\
224224
| This device uses 4bit colorValues (0-16) |
@@ -241,7 +241,10 @@ void RGBController_AsusSagarisKeyboard::DeviceUpdateMode()
241241

242242
uint8_t mode = modes[active_mode].value;
243243

244-
if(mode == SAGARIS_KEYBOARD_MODE_STARRY_NIGHT) colorIndex = 7;
244+
if(mode == SAGARIS_KEYBOARD_MODE_STARRY_NIGHT)
245+
{
246+
colorIndex = 7;
247+
}
245248

246249
controller->SetMode(mode, modes[active_mode].brightness, modes[active_mode].speed, colorIndex);
247250
}

0 commit comments

Comments
 (0)