Skip to content

Commit 8b84510

Browse files
k1-801CalcProgrammer1
k1-801
authored and
CalcProgrammer1
committed
Non-important warnings removed
Commit amended by Adam Honse <calcprogrammer1@gmail.com> due to merging from a different branch.
1 parent 94c18fc commit 8b84510

41 files changed

Lines changed: 216 additions & 199 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Controllers/AorusCPUCoolerController/ATC800Controller.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ATC800Controller::~ATC800Controller()
2424
void ATC800Controller::SendCoolerMode
2525
(
2626
unsigned char mode,
27-
unsigned short speed,
27+
unsigned short /*speed*/,
2828
unsigned char channel,
2929
unsigned char red,
3030
unsigned char green,

‎Controllers/AuraSMBusController/AuraSMBusController.cpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@
1010
#include "AuraSMBusController.h"
1111
#include <cstring>
1212

13+
static const char* aura_channels[] = /* Aura channel strings */
14+
{
15+
"Audio",
16+
"Backplate",
17+
"Back I/O",
18+
"Center",
19+
"Center",
20+
"DRAM",
21+
"PCIe",
22+
"RGB Header",
23+
"RGB Header 2",
24+
"RGB Header",
25+
"Unknown",
26+
};
27+
1328
AuraSMBusController::AuraSMBusController(i2c_smbus_interface* bus, aura_dev_id dev)
1429
{
1530
this->bus = bus;

‎Controllers/AuraSMBusController/AuraSMBusController.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,6 @@ enum
6666
AURA_LED_CHANNEL_RGB_HEADER_3 = 0x91, /* RGB Header 3 LED channel */
6767
};
6868

69-
static const char* aura_channels[] = /* Aura channel strings */
70-
{
71-
"Audio",
72-
"Backplate",
73-
"Back I/O",
74-
"Center",
75-
"Center",
76-
"DRAM",
77-
"PCIe",
78-
"RGB Header",
79-
"RGB Header 2",
80-
"RGB Header",
81-
"Unknown",
82-
};
83-
8469
enum
8570
{
8671
AURA_CONFIG_LED_COUNT = 0x02, /* LED Count configuration offset */

‎Controllers/AuraUSBController/AuraAddressableController.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void AuraAddressableController::SetChannelLEDs(unsigned char channel, RGBColor *
4040
leds_to_send = num_colors - leds_sent;
4141
}
4242

43-
for(int led_idx = 0; led_idx < leds_to_send; led_idx++)
43+
for(unsigned int led_idx = 0; led_idx < leds_to_send; led_idx++)
4444
{
4545
led_data[(led_idx * 3) + 0] = RGBGetRValue(colors[led_idx + leds_sent]);
4646
led_data[(led_idx * 3) + 1] = RGBGetGValue(colors[led_idx + leds_sent]);

‎Controllers/AuraUSBController/AuraMainboardController.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void AuraMainboardController::SetChannelLEDs(unsigned char channel, RGBColor * c
4444
leds_to_send = num_colors - leds_sent;
4545
}
4646

47-
for(int led_idx = 0; led_idx < leds_to_send; led_idx++)
47+
for(unsigned int led_idx = 0; led_idx < leds_to_send; led_idx++)
4848
{
4949
led_data[(led_idx * 3) + 0] = RGBGetRValue(colors[led_idx + leds_sent]);
5050
led_data[(led_idx * 3) + 1] = RGBGetGValue(colors[led_idx + leds_sent]);

‎Controllers/CoolerMasterController/CMMP750Controller.cpp‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,38 @@
99

1010
#include "CMMP750Controller.h"
1111

12+
static unsigned char colour_mode_data[][6] =
13+
{
14+
{ 0x01, 0x04, 0xFF, 0x00, 0xFF, 0x00 }, /* Static */
15+
{ 0x02, 0x04, 0xFF, 0x00, 0xFF, 0x80 }, /* Blinking */
16+
{ 0x03, 0x04, 0xFF, 0x00, 0xFF, 0x80 }, /* Breathing */
17+
{ 0x04, 0x04, 0x80, 0x00, 0x00, 0x00 }, /* Colour Cycle */
18+
{ 0x05, 0x04, 0x80, 0x00, 0x00, 0x00 } /* Colour Breath */
19+
};
20+
21+
static unsigned char speed_mode_data[][9] =
22+
{
23+
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },/* Static */
24+
{ 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Blinking */
25+
{ 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Breathing */
26+
{ 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Colour Cycle */
27+
{ 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 } /* Colour Breath */
28+
};
29+
1230
CMMP750Controller::CMMP750Controller(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path)
1331
{
14-
int tmp_size = wcslen(_vendor);
15-
dev = dev_handle;
16-
location = _path;
32+
std::size_t tmp_size = wcslen(_vendor);
33+
dev = dev_handle;
34+
location = _path;
1735

18-
for (int i=0; ( i<tmp_size && i<CM_DEVICE_NAME_SIZE); i++)
36+
for(std::size_t i = 0; (i < tmp_size) && (i < CM_DEVICE_NAME_SIZE); i++)
1937
{
2038
device_name[i] = (char)_vendor[i];
2139
}
22-
for (int j=0; ( j<wcslen(_vendor) && tmp_size+j<CM_DEVICE_NAME_SIZE); j++)
23-
device_name[tmp_size+j] = (char)_device_name[j];
40+
for(std::size_t j = 0; (j < wcslen(_vendor)) && (tmp_size + j < CM_DEVICE_NAME_SIZE); j++)
41+
{
42+
device_name[tmp_size + j] = (char)_device_name[j];
43+
}
2444

2545
GetStatus(); //When setting up device get current status
2646
}
@@ -39,20 +59,22 @@ void CMMP750Controller::GetStatus()
3959
hid_write(dev, buffer, buffer_size);
4060
hid_read(dev, buffer, buffer_size);
4161

42-
if( buffer[0] == 0x80 && buffer[1] == 0x05 )
62+
if((buffer[0] == 0x80) && (buffer[1] == 0x05))
4363
{
4464
current_mode = buffer[2] - 1;
4565
current_red = buffer[3];
4666
current_green = buffer[4];
4767
current_blue = buffer[5];
4868

49-
for( int i = 0; speed_mode_data[current_mode][i] >= buffer[6]; i++)
69+
for(int i = 0; speed_mode_data[current_mode][i] >= buffer[6]; i++)
70+
{
5071
current_speed = i;
72+
}
5173
}
5274
else
5375
{
5476
//Code should never reach here however just in case there is a failure set something
55-
current_mode = MP750_MODE_COLOR_CYCLE; //Unicorn Spew
77+
current_mode = MP750_MODE_COLOR_CYCLE; //Unicorn Spew
5678
current_red = 0xFF;
5779
current_green = 0xFF;
5880
current_blue = 0xFF;
@@ -122,24 +144,24 @@ void CMMP750Controller::SendUpdate()
122144
unsigned char buffer[0x40] = { 0x00 };
123145
int buffer_size = (sizeof(buffer) / sizeof(buffer[0]));
124146

125-
for(int i = 0; i < CM_COLOUR_MODE_DATA_SIZE; i++)
147+
for(std::size_t i = 0; i < CM_COLOUR_MODE_DATA_SIZE; i++)
126148
{
127149
buffer[i] = colour_mode_data[current_mode][i];
128150
}
129151

130152
if(current_mode > MP750_MODE_BREATHING)
131153
{
132154
//If the mode is random colours set SPEED at BYTE2
133-
buffer[CM_RED_BYTE] = speed_mode_data[current_mode][current_speed];
155+
buffer[CM_RED_BYTE] = speed_mode_data[current_mode][current_speed];
134156
}
135157
else
136158
{
137159
//Otherwise SPEED is BYTE5
138-
buffer[CM_RED_BYTE] = current_red;
139-
buffer[CM_GREEN_BYTE] = current_green;
140-
buffer[CM_BLUE_BYTE] = current_blue;
141-
buffer[CM_SPEED_BYTE] = speed_mode_data[current_mode][current_speed];
160+
buffer[CM_RED_BYTE] = current_red;
161+
buffer[CM_GREEN_BYTE] = current_green;
162+
buffer[CM_BLUE_BYTE] = current_blue;
163+
buffer[CM_SPEED_BYTE] = speed_mode_data[current_mode][current_speed];
142164
}
143165

144166
hid_write(dev, buffer, buffer_size);
145-
}
167+
}

‎Controllers/CoolerMasterController/CMMP750Controller.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,6 @@ enum
4444
MP750_MODE_BREATH_CYCLE = 0x04 //Breathing Cycle Mode
4545
};
4646

47-
static unsigned char colour_mode_data[][6] =
48-
{
49-
{ 0x01, 0x04, 0xFF, 0x00, 0xFF, 0x00 }, /* Static */
50-
{ 0x02, 0x04, 0xFF, 0x00, 0xFF, 0x80 }, /* Blinking */
51-
{ 0x03, 0x04, 0xFF, 0x00, 0xFF, 0x80 }, /* Breathing */
52-
{ 0x04, 0x04, 0x80, 0x00, 0x00, 0x00 }, /* Colour Cycle */
53-
{ 0x05, 0x04, 0x80, 0x00, 0x00, 0x00 } /* Colour Breath */
54-
};
55-
56-
static unsigned char speed_mode_data[][9] =
57-
{
58-
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },/* Static */
59-
{ 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Blinking */
60-
{ 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Breathing */
61-
{ 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 },/* Colour Cycle */
62-
{ 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 } /* Colour Breath */
63-
};
64-
6547
enum
6648
{
6749
MP750_SPEED_SLOWEST = 0x00, /* Slowest speed */

‎Controllers/EKController/EKController.cpp‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,60 @@
99

1010
#include "EKController.h"
1111

12+
static unsigned char colour_mode_data[][16] =
13+
{
14+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
15+
0x00, 0x10, 0x20, 0x01, 0x01, 0x00, 0xFF, 0x64}, // Static
16+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
17+
0x00, 0x10, 0x20, 0x01, 0x02, 0x00, 0xFF, 0x64}, // Breathing
18+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
19+
0x00, 0x10, 0x20, 0x01, 0x03, 0xFF, 0xFF, 0x64}, // Fading
20+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
21+
0x00, 0x10, 0x20, 0x01, 0x04, 0x00, 0xFF, 0x64}, // Marquee
22+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
23+
0x00, 0x10, 0x20, 0x01, 0x05, 0x00, 0xFF, 0x64}, // Covering Marquee
24+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
25+
0x00, 0x10, 0x20, 0x01, 0x06, 0x00, 0xFF, 0x64}, // Pulse
26+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
27+
0x00, 0x10, 0x20, 0x01, 0x07, 0x00, 0xFF, 0x64}, // Wave
28+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
29+
0x00, 0x10, 0x20, 0x01, 0x08, 0x00, 0xFF, 0x64}, // Alternating
30+
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
31+
0x00, 0x10, 0x20, 0x01, 0x09, 0x00, 0xFF, 0x64}, // Candle
32+
};
33+
34+
static unsigned char speed_mode_data[][9] =
35+
{
36+
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // Static
37+
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Breathing
38+
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Fading
39+
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Marquee
40+
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Covering Marquee
41+
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Pulse
42+
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Wave
43+
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Alternating
44+
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 } // Candle
45+
};
46+
1247
EKController::EKController(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path)
1348
{
14-
int tmp_size = wcslen(_vendor);
49+
std::size_t tmp_size = wcslen(_vendor);
1550

1651
dev = dev_handle;
1752

18-
for(int i=0; (i < tmp_size) && (i < EK_DEVICE_NAME_SIZE); i++)
53+
for(std::size_t i = 0; (i < tmp_size) && (i < EK_DEVICE_NAME_SIZE); i++)
1954
{
2055
device_name[i] = (char)_vendor[i];
2156
}
2257

23-
for(int j=0; (j < wcslen(_vendor)) && ((tmp_size + j) < EK_DEVICE_NAME_SIZE); j++)
58+
for(std::size_t j = 0; (j < wcslen(_vendor)) && ((tmp_size + j) < EK_DEVICE_NAME_SIZE); j++)
2459
{
25-
device_name[tmp_size+j] = (char)_device_name[j];
60+
device_name[tmp_size + j] = (char)_device_name[j];
2661
}
2762

2863
location = _path;
2964

30-
current_mode = EK_MODE_STATIC;
65+
current_mode = EK_MODE_STATIC;
3166
current_speed = EK_SPEED_NORMAL;
3267
}
3368

@@ -76,15 +111,15 @@ void EKController::SendUpdate()
76111
unsigned char buffer[EK_PACKET_LENGTH] = { 0x00 };
77112
int buffer_size = (sizeof(buffer) / sizeof(buffer[0]));
78113

79-
for(int i = 0; i < EK_COLOUR_MODE_DATA_SIZE; i++)
114+
for(std::size_t i = 0; i < EK_COLOUR_MODE_DATA_SIZE; i++)
80115
{
81116
buffer[i] = colour_mode_data[current_mode][i];
82117
}
83118

84119
//Set the relevant colour info
85-
buffer[EK_RED_BYTE] = current_red;
120+
buffer[EK_RED_BYTE] = current_red;
86121
buffer[EK_GREEN_BYTE] = current_green;
87-
buffer[EK_BLUE_BYTE] = current_blue;
122+
buffer[EK_BLUE_BYTE] = current_blue;
88123
buffer[EK_SPEED_BYTE] = speed_mode_data[current_mode][current_speed];
89124

90125
buffer[10] = 0x10;

‎Controllers/EKController/EKController.h‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -39,41 +39,6 @@ enum
3939
EK_MODE_CANDLE = 0x08 //Candle Mode
4040
};
4141

42-
static unsigned char colour_mode_data[][16] =
43-
{
44-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
45-
0x00, 0x10, 0x20, 0x01, 0x01, 0x00, 0xFF, 0x64}, // Static
46-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
47-
0x00, 0x10, 0x20, 0x01, 0x02, 0x00, 0xFF, 0x64}, // Breathing
48-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
49-
0x00, 0x10, 0x20, 0x01, 0x03, 0xFF, 0xFF, 0x64}, // Fading
50-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
51-
0x00, 0x10, 0x20, 0x01, 0x04, 0x00, 0xFF, 0x64}, // Marquee
52-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
53-
0x00, 0x10, 0x20, 0x01, 0x05, 0x00, 0xFF, 0x64}, // Covering Marquee
54-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
55-
0x00, 0x10, 0x20, 0x01, 0x06, 0x00, 0xFF, 0x64}, // Pulse
56-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
57-
0x00, 0x10, 0x20, 0x01, 0x07, 0x00, 0xFF, 0x64}, // Wave
58-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
59-
0x00, 0x10, 0x20, 0x01, 0x08, 0x00, 0xFF, 0x64}, // Alternating
60-
{ 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
61-
0x00, 0x10, 0x20, 0x01, 0x09, 0x00, 0xFF, 0x64}, // Candle
62-
};
63-
64-
static unsigned char speed_mode_data[][9] =
65-
{
66-
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // Static
67-
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Breathing
68-
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Fading
69-
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Marquee
70-
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Covering Marquee
71-
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Pulse
72-
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Wave
73-
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }, // Alternating
74-
{ 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 } // Candle
75-
};
76-
7742
enum
7843
{
7944
EK_SPEED_SLOWEST = 0x00, // Slowest speed

‎Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void HyperXAlloyOriginsController::SendDirectColorPacket
116116
/*-----------------------------------------------------*\
117117
| Copy in color data |
118118
\*-----------------------------------------------------*/
119-
for(int color_idx = 0; color_idx < color_count; color_idx++)
119+
for(unsigned int color_idx = 0; color_idx < color_count; color_idx++)
120120
{
121121
buf[(color_idx * 4) + 1] = 0x81;
122122
buf[(color_idx * 4) + 2] = RGBGetRValue(color_data[color_idx]);
@@ -128,4 +128,4 @@ void HyperXAlloyOriginsController::SendDirectColorPacket
128128
| Send packet |
129129
\*-----------------------------------------------------*/
130130
hid_send_feature_report(dev, buf, 65);
131-
}
131+
}

0 commit comments

Comments
 (0)