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

Update data array size, thanks to lynix

Browse Source
This commit is contained in:
MatMoul 2016-06-19 22:35:01 +02:00
parent 345bcbfcbf
commit e6eb5a8434
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/classes/Keyboard.cpp
View File

@ -53,7 +53,7 @@ bool Keyboard::detach() {
bool Keyboard::commit() { bool Keyboard::commit() {
if (m_isAttached == false) return false; if (m_isAttached == false) return false;
bool retval = false; bool retval = false;
unsigned char *data = new unsigned char[20-1]; unsigned char *data = new unsigned char[20];
data[0] = 0x11; data[0] = 0x11;
data[1] = 0xff; data[1] = 0xff;
data[2] = 0x0c; data[2] = 0x0c;
@ -443,7 +443,7 @@ bool Keyboard::setKeysInternal(KeyAddressGroup addressGroup, KeyValue keyValues[
int data_size; int data_size;
if (addressGroup == KeyAddressGroup::logo) { if (addressGroup == KeyAddressGroup::logo) {
data_size = 20; data_size = 20;
data = new unsigned char[data_size - 1]; data = new unsigned char[data_size];
populateAddressGroupInternal(addressGroup, data); populateAddressGroupInternal(addressGroup, data);
data[8] = keyValues[0].key.id; data[8] = keyValues[0].key.id;
data[9] = keyValues[0].colors.red; data[9] = keyValues[0].colors.red;
@ -452,7 +452,7 @@ bool Keyboard::setKeysInternal(KeyAddressGroup addressGroup, KeyValue keyValues[
for(int i = 12; i < data_size; i++) data[i] = 0x00; for(int i = 12; i < data_size; i++) data[i] = 0x00;
} else { } else {
data_size = 108; data_size = 108;
data = new unsigned char[data_size - 1]; data = new unsigned char[data_size];
populateAddressGroupInternal(addressGroup, data); populateAddressGroupInternal(addressGroup, data);
int maxKeyValueCount = (data_size - 8) / 4; int maxKeyValueCount = (data_size - 8) / 4;
if (keyValueCount > maxKeyValueCount) keyValueCount = maxKeyValueCount; if (keyValueCount > maxKeyValueCount) keyValueCount = maxKeyValueCount;
@ -478,7 +478,7 @@ bool Keyboard::setKeysInternal(KeyAddressGroup addressGroup, KeyValue keyValues[
bool Keyboard::setPowerOnEffect(PowerOnEffect powerOnEffect) { bool Keyboard::setPowerOnEffect(PowerOnEffect powerOnEffect) {
bool retval = false; bool retval = false;
int data_size = 20; int data_size = 20;
unsigned char *data = new unsigned char[data_size - 1]; unsigned char *data = new unsigned char[data_size];
data[0] = 0x11; // Base address data[0] = 0x11; // Base address
data[1] = 0xff; // Base address data[1] = 0xff; // Base address
data[2] = 0x0d; // Base address data[2] = 0x0d; // Base address
@ -505,11 +505,11 @@ bool Keyboard::setKey(KeyValue keyValue) {
int data_size; int data_size;
if (keyValue.key.addressGroup == KeyAddressGroup::logo) { if (keyValue.key.addressGroup == KeyAddressGroup::logo) {
data_size = 20; data_size = 20;
data = new unsigned char[data_size - 1]; data = new unsigned char[data_size];
populateAddressGroupInternal(keyValue.key.addressGroup, data); populateAddressGroupInternal(keyValue.key.addressGroup, data);
} else { } else {
data_size = 108; data_size = 108;
data = new unsigned char[data_size - 1]; data = new unsigned char[data_size];
populateAddressGroupInternal(keyValue.key.addressGroup, data); populateAddressGroupInternal(keyValue.key.addressGroup, data);
} }
data[8] = keyValue.key.id; data[8] = keyValue.key.id;