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

Set value from andreast1990 return

Browse Source
This commit is contained in:
MatMoul 2016-11-28 00:54:29 +01:00
parent 07b3ecaf08
commit f29e47da92
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/classes/Keyboard.cpp
View File

@ -28,7 +28,7 @@ bool Keyboard::attach() {
if (desc.idProduct == 0xc337) { pid = desc.idProduct; break; } // G810 spectrum if (desc.idProduct == 0xc337) { pid = desc.idProduct; break; } // G810 spectrum
if (desc.idProduct == 0xc330) { pid = desc.idProduct; break; } // G410 spectrum if (desc.idProduct == 0xc330) { pid = desc.idProduct; break; } // G410 spectrum
if (desc.idProduct == 0xc333) { pid = desc.idProduct; break; } // G610 spectrum if (desc.idProduct == 0xc333) { pid = desc.idProduct; break; } // G610 spectrum
if (desc.idProduct == 0xc333) { // G910 spark if (desc.idProduct == 0xc32b) { // G910 spark
pid = desc.idProduct; pid = desc.idProduct;
kbdProtocol = KeyboardProtocol::spark; kbdProtocol = KeyboardProtocol::spark;
break; break;
@ -89,8 +89,8 @@ bool Keyboard::commit() {
case KeyboardProtocol::spark: case KeyboardProtocol::spark:
data[0] = 0x11; data[0] = 0x11;
data[1] = 0xff; data[1] = 0xff;
data[2] = 0x0c; //Need change data[2] = 0x0f;
data[3] = 0x5a; //Need change data[3] = 0x5d;
break; break;
default: default:
return false; return false;
@ -154,39 +154,39 @@ bool Keyboard::getKeyAddress(Key key, KeyAddress &keyAddress) {
break; break;
case Key::g1: case Key::g1:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x01;
break; break;
case Key::g2: case Key::g2:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x02;
break; break;
case Key::g3: case Key::g3:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x03;
break; break;
case Key::g4: case Key::g4:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x04;
break; break;
case Key::g5: case Key::g5:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x05;
break; break;
case Key::g6: case Key::g6:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x06;
break; break;
case Key::g7: case Key::g7:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x07;
break; break;
case Key::g8: case Key::g8:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x08;
break; break;
case Key::g9: case Key::g9:
keyAddress.addressGroup = KeyAddressGroup::gkeys; keyAddress.addressGroup = KeyAddressGroup::gkeys;
keyAddress.id = 0x00; // Need change keyAddress.id = 0x09;
break; break;
default: default:
keyAddress.addressGroup = KeyAddressGroup::keys; keyAddress.addressGroup = KeyAddressGroup::keys;
@ -535,12 +535,12 @@ bool Keyboard::populateAddressGroupInternal(KeyAddressGroup addressGroup, unsign
case KeyAddressGroup::logo: case KeyAddressGroup::logo:
data[0] = 0x11; // Base address data[0] = 0x11; // Base address
data[1] = 0xff; // Base address data[1] = 0xff; // Base address
data[2] = 0x0c; // Base address data[2] = 0x0f; // Base address
data[3] = 0x3a; // Base address data[3] = 0x3a; // Base address
data[4] = 0x00; // Base address data[4] = 0x00; // Base address
data[5] = 0x10; // Base address data[5] = 0x10; // Base address
data[6] = 0x00; // Base address data[6] = 0x00; // Base address
data[7] = 0x01; // Base address data[7] = 0x02; // Base address
break; break;
case KeyAddressGroup::indicators: case KeyAddressGroup::indicators:
data[0] = 0x12; // Base address data[0] = 0x12; // Base address
@ -552,7 +552,7 @@ bool Keyboard::populateAddressGroupInternal(KeyAddressGroup addressGroup, unsign
data[6] = 0x00; // Base address data[6] = 0x00; // Base address
data[7] = 0x05; // Base address data[7] = 0x05; // Base address
break; break;
case KeyAddressGroup::multimedia: case KeyAddressGroup::multimedia: // Not tested
data[0] = 0x12; // Base address data[0] = 0x12; // Base address
data[1] = 0xff; // Base address data[1] = 0xff; // Base address
data[2] = 0x0c; // Base address data[2] = 0x0c; // Base address
@ -565,8 +565,8 @@ bool Keyboard::populateAddressGroupInternal(KeyAddressGroup addressGroup, unsign
case KeyAddressGroup::keys: case KeyAddressGroup::keys:
data[0] = 0x12; // Base address data[0] = 0x12; // Base address
data[1] = 0xff; // Base address data[1] = 0xff; // Base address
data[2] = 0x0c; // Base address data[2] = 0x0f; // Base address
data[3] = 0x3a; // Base address data[3] = 0x3d; // Base address
data[4] = 0x00; // Base address data[4] = 0x00; // Base address
data[5] = 0x01; // Base address data[5] = 0x01; // Base address
data[6] = 0x00; // Base address data[6] = 0x00; // Base address
@ -575,12 +575,12 @@ bool Keyboard::populateAddressGroupInternal(KeyAddressGroup addressGroup, unsign
case KeyAddressGroup::gkeys: case KeyAddressGroup::gkeys:
data[0] = 0x12; // Base address data[0] = 0x12; // Base address
data[1] = 0xff; // Base address data[1] = 0xff; // Base address
data[2] = 0x0c; // Base address data[2] = 0x0f; // Base address
data[3] = 0x3a; // Base address data[3] = 0x3e; // Base address
data[4] = 0x00; // Base address data[4] = 0x00; // Base address
data[5] = 0x01; // Base address data[5] = 0x04; // Base address
data[6] = 0x00; // Base address data[6] = 0x00; // Base address
data[7] = 0x0e; // Base address data[7] = 0x09; // Base address
break; break;
default: default:
return false; return false;