m/g810-led
1
0
Fork 0
mirror of https://github.com/MatMoul/g810-led.git synced 2024-12-23 09:16:11 +00:00
Code

Add multiple logo support

Browse Source
This commit is contained in:
MatMoul 2016-11-29 21:34:31 +01:00
parent b040e1b5c0
commit c941052edb
1 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/classes/Keyboard.cpp
View File

@ -589,42 +589,22 @@ bool Keyboard::setKeysInternal(KeyAddressGroup addressGroup, KeyValue keyValues[
unsigned char *data; unsigned char *data;
int data_size; int data_size;
int maxKeyValueCount = 0; int maxKeyValueCount = 0;
if (addressGroup == KeyAddressGroup::logo) { if (addressGroup == KeyAddressGroup::logo) data_size = 20;
data_size = 20; else data_size = 64;
data = new unsigned char[data_size]; data = new unsigned char[data_size];
populateAddressGroupInternal(addressGroup, data); populateAddressGroupInternal(addressGroup, data);
maxKeyValueCount = (data_size - 8) / 4; maxKeyValueCount = (data_size - 8) / 4;
for(int i = 0; i < maxKeyValueCount; i++) { for(int i = 0; i < maxKeyValueCount; i++) {
if (i < keyValueCount) { if (i < keyValueCount) {
data[8 + i * 4 + 0] = keyValues[i].key.id; data[8 + i * 4 + 0] = keyValues[i].key.id;
data[8 + i * 4 + 1] = keyValues[i].colors.red; data[8 + i * 4 + 1] = keyValues[i].colors.red;
data[8 + i * 4 + 2] = keyValues[i].colors.green; data[8 + i * 4 + 2] = keyValues[i].colors.green;
data[8 + i * 4 + 3] = keyValues[i].colors.blue; data[8 + i * 4 + 3] = keyValues[i].colors.blue;
} else { } else {
data[8 + i * 4 + 0] = 0x00; data[8 + i * 4 + 0] = 0x00;
data[8 + i * 4 + 1] = 0x00; data[8 + i * 4 + 1] = 0x00;
data[8 + i * 4 + 2] = 0x00; data[8 + i * 4 + 2] = 0x00;
data[8 + i * 4 + 3] = 0x00; data[8 + i * 4 + 3] = 0x00;
}
}
} else {
data_size = 64;
data = new unsigned char[data_size];
populateAddressGroupInternal(addressGroup, data);
maxKeyValueCount = (data_size - 8) / 4;
if (keyValueCount > maxKeyValueCount) keyValueCount = maxKeyValueCount;
for(int i = 0; i < maxKeyValueCount; i++) {
if (i < keyValueCount) {
data[8 + i * 4 + 0] = keyValues[i].key.id;
data[8 + i * 4 + 1] = keyValues[i].colors.red;
data[8 + i * 4 + 2] = keyValues[i].colors.green;
data[8 + i * 4 + 3] = keyValues[i].colors.blue;
} else {
data[8 + i * 4 + 0] = 0x00;
data[8 + i * 4 + 1] = 0x00;
data[8 + i * 4 + 2] = 0x00;
data[8 + i * 4 + 3] = 0x00;
}
} }
} }
retval = sendDataInternal(data, data_size); retval = sendDataInternal(data, data_size);