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

Add FX features

Browse Source
This commit is contained in:
MatMoul 2017-01-08 03:23:13 +01:00
parent ce14d3e9ea
commit f4ea0405cd
4 changed files with 165 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sample_profiles/all_blue_fxl_breathing_red Normal file
View File

@ -0,0 +1,5 @@
a 0000ff # Set all keys blue
c # Commit changes
fxl-breathing ff0000 10 # Set breathing effect with red color and speed 10

90
src/classes/Keyboard.cpp
View File

@ -883,7 +883,7 @@ bool Keyboard::setGroupKeys(KeyGroup keyGroup, KeyColors colors) {
return true;
}
bool Keyboard::setFXColor(KeyColors colors) {
bool Keyboard::setFXColorKeys(KeyColors colors) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
@ -899,6 +899,15 @@ bool Keyboard::setFXColor(KeyColors colors) {
for(int i = 10; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
delete[] data;
return retval;
}
bool Keyboard::setFXColorLogo(KeyColors colors) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
// Logo
populateFXAddressInternal(data);
data[4] = 0x01; // Logo
@ -914,7 +923,7 @@ bool Keyboard::setFXColor(KeyColors colors) {
return retval;
}
bool Keyboard::setFXBreathing(KeyColors colors, uint8_t speed) {
bool Keyboard::setFXBreathingKeys(KeyColors colors, uint8_t speed) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
@ -933,6 +942,15 @@ bool Keyboard::setFXBreathing(KeyColors colors, uint8_t speed) {
for(int i = 13; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
delete[] data;
return retval;
}
bool Keyboard::setFXBreathingLogo(KeyColors colors, uint8_t speed) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
// Logo
populateFXAddressInternal(data);
data[4] = 0x01; // Logo
@ -951,7 +969,7 @@ bool Keyboard::setFXBreathing(KeyColors colors, uint8_t speed) {
return retval;
}
bool Keyboard::setFXColorCycle(uint8_t speed) {
bool Keyboard::setFXColorCycleKeys(uint8_t speed) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
@ -972,6 +990,15 @@ bool Keyboard::setFXColorCycle(uint8_t speed) {
for(int i = 15; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
delete[] data;
return retval;
}
bool Keyboard::setFXColorCycleLogo(uint8_t speed) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
// Logo
populateFXAddressInternal(data);
data[4] = 0x01; // Logo
@ -992,7 +1019,7 @@ bool Keyboard::setFXColorCycle(uint8_t speed) {
return retval;
}
bool Keyboard::setFXHWave(uint8_t speed) {
bool Keyboard::setFXHWaveKeys(uint8_t speed) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
@ -1014,28 +1041,11 @@ bool Keyboard::setFXHWave(uint8_t speed) {
for(int i = 16; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
// Logo
populateFXAddressInternal(data);
data[4] = 0x01; // Logo
data[5] = 0x03; // Effect
data[6] = 0x00;
data[7] = 0x00;
data[8] = 0x00;
data[9] = 0x00;
data[10] = 0x00;
data[11] = speed; // Speed
data[12] = 0x88;
data[13] = 0x64;
data[14] = 0x00;
data[15] = 0x00;
for(int i = 16; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
delete[] data;
return retval;
}
bool Keyboard::setFXVWave(uint8_t speed) {
bool Keyboard::setFXVWaveKeys(uint8_t speed) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
@ -1057,28 +1067,11 @@ bool Keyboard::setFXVWave(uint8_t speed) {
for(int i = 16; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
// Logo
populateFXAddressInternal(data);
data[4] = 0x01; // Logo
data[5] = 0x03; // Effect
data[6] = 0x00;
data[7] = 0x00;
data[8] = 0x00;
data[9] = 0x00;
data[10] = 0x00;
data[11] = speed; // Speed
data[12] = 0x88;
data[13] = 0x64;
data[14] = 0x00;
data[15] = 0x00;
for(int i = 16; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
delete[] data;
return retval;
}
bool Keyboard::setFXCWave(uint8_t speed) {
bool Keyboard::setFXCWaveKeys(uint8_t speed) {
bool retval = false;
int data_size = 20;
unsigned char *data = new unsigned char[data_size];
@ -1100,23 +1093,6 @@ bool Keyboard::setFXCWave(uint8_t speed) {
for(int i = 16; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
// Logo
populateFXAddressInternal(data);
data[4] = 0x01; // Logo
data[5] = 0x03; // Effect
data[6] = 0x00;
data[7] = 0x00;
data[8] = 0x00;
data[9] = 0x00;
data[10] = 0x00;
data[11] = speed; // Speed
data[12] = 0x88;
data[13] = 0x64;
data[14] = 0x00;
data[15] = 0x00;
for(int i = 16; i < data_size; i++) data[i] = 0x00;
retval = sendDataInternal(data, data_size);
delete[] data;
return retval;
}

15
src/classes/Keyboard.h
View File

@ -52,12 +52,15 @@ class Keyboard {
bool setKeys(KeyValue keyValue[], size_t keyValueCount);
bool setAllKeys(KeyColors colors);
bool setGroupKeys(KeyGroup keyGroup, KeyColors colors);
bool setFXColor(KeyColors colors);
bool setFXBreathing(KeyColors colors, uint8_t speed);
bool setFXColorCycle(uint8_t speed);
bool setFXHWave(uint8_t speed);
bool setFXVWave(uint8_t speed);
bool setFXCWave(uint8_t speed);
bool setFXColorKeys(KeyColors colors);
bool setFXColorLogo(KeyColors colors);
bool setFXBreathingKeys(KeyColors colors, uint8_t speed);
bool setFXBreathingLogo(KeyColors colors, uint8_t speed);
bool setFXColorCycleKeys(uint8_t speed);
bool setFXColorCycleLogo(uint8_t speed);
bool setFXHWaveKeys(uint8_t speed);
bool setFXVWaveKeys(uint8_t speed);
bool setFXCWaveKeys(uint8_t speed);
private:

227
src/main.cpp
View File

@ -22,7 +22,6 @@ void usage() {
cout<<" -an color :\t\t\tSet all keys without commit"<<endl;
cout<<" -gn group, color :\t\tSet a group of keys without commit"<<endl;
cout<<" -kn key, color :\t\tSet a key without commit"<<endl;
cout<<""<<endl;
cout<<" -c :\t\t\t\tCommit changes"<<endl;
cout<<""<<endl;
cout<<" -fx-color color :\t\tSet static color effect"<<endl;
@ -32,6 +31,17 @@ void usage() {
cout<<" -fx-vwave speed :\t\tSet vertical color wave effect"<<endl;
cout<<" -fx-cwave speed :\t\tSet center color wave effect"<<endl;
cout<<""<<endl;
cout<<" -fxk-color color :\t\tSet static color effect (keys only)"<<endl;
cout<<" -fxk-breathing color, speed :\tSet breathing effect (keys only)"<<endl;
cout<<" -fxk-cycle speed :\t\tSet color cycle effect (keys only)"<<endl;
cout<<" -fxk-hwave speed :\t\tSet horizontal color wave effect (keys only)"<<endl;
cout<<" -fxk-vwave speed :\t\tSet vertical color wave effect (keys only)"<<endl;
cout<<" -fxk-cwave speed :\t\tSet center color wave effect (keys only)"<<endl;
cout<<""<<endl;
cout<<" -fxl-color color :\t\tSet static color effect (logo only)"<<endl;
cout<<" -fxl-breathing color, speed :\tSet breathing effect (logo only)"<<endl;
cout<<" -fxl-cycle speed :\t\tSet color cycle effect (logo only)"<<endl;
cout<<""<<endl;
cout<<" -p profilefile :\t\tLoad a profile from a file"<<endl;
cout<<" -pp profilepipe :\t\tLoad a profile from stdin"<<endl;
cout<<""<<endl;
@ -50,10 +60,10 @@ void usage() {
cout<<appname<<" -a 00ff00"<<endl;
cout<<appname<<" -g fkeys ff00ff"<<endl;
cout<<appname<<" -s color"<<endl;
cout<<appname<<" -fx-cycle 10"<<endl;
cout<<appname<<" -fx-cycle 1f"<<endl;
cout<<appname<<" -p profilefile"<<endl;
cout<<""<<endl;
cout<<"samples with pipe:"<<endl;
cout<<"samples with pipe :"<<endl;
cout<<appname<<" -pp < profilefile"<<endl;
cout<<"echo -e \"k w ff0000\\nk a ff0000\\nk s ff0000\\nk d ff0000\\nc\" | "<<appname<<" -pp"<<endl;
}
@ -217,7 +227,7 @@ int setGroupKeys(string groupKeys, string color, bool commit) {
return 1;
}
int setFXColor(string color) {
int setFXColor(string color, bool keys, bool logo) {
Keyboard lg_kbd;
Keyboard::KeyColors colors;
if (lg_kbd.parseColor(color, colors) == true) {
@ -226,25 +236,23 @@ int setFXColor(string color) {
lg_kbd.commit();
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXColor(colors);
if(keys) lg_kbd.setFXColorKeys(colors);
if(logo) lg_kbd.setFXColorLogo(colors);
lg_kbd.detach();
return 0;
}
return 1;
}
int setFXBreathing(string color, string speed) {
int setFXBreathing(string color, string speed, bool keys, bool logo) {
Keyboard lg_kbd;
Keyboard::KeyColors colors;
uint8_t speedValue;
if (lg_kbd.parseColor(color, colors) == true) {
if (lg_kbd.parseSpeed(speed, speedValue) == true) {
lg_kbd.attach();
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXBreathing(colors, speedValue);
if(keys) lg_kbd.setFXBreathingKeys(colors, speedValue);
if(logo) lg_kbd.setFXBreathingLogo(colors, speedValue);
lg_kbd.detach();
return 0;
}
@ -252,80 +260,52 @@ int setFXBreathing(string color, string speed) {
return 1;
}
int setFXColorCycle(string speed) {
int setFXColorCycle(string speed, bool keys, bool logo) {
Keyboard lg_kbd;
Keyboard::KeyColors colors;
uint8_t speedValue;
if (lg_kbd.parseSpeed(speed, speedValue) == true) {
colors.red = 0xff;
colors.green = 0xff;
colors.blue = 0xff;
lg_kbd.attach();
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXColorCycle(speedValue);
if(keys) lg_kbd.setFXColorCycleKeys(speedValue);
if(logo) lg_kbd.setFXColorCycleLogo(speedValue);
lg_kbd.detach();
return 0;
}
return 1;
}
int setFXHWave(string speed) {
int setFXHWave(string speed, bool keys, bool logo) {
Keyboard lg_kbd;
Keyboard::KeyColors colors;
uint8_t speedValue;
if (lg_kbd.parseSpeed(speed, speedValue) == true) {
colors.red = 0xff;
colors.green = 0xff;
colors.blue = 0xff;
lg_kbd.attach();
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXHWave(speedValue);
if(keys) lg_kbd.setFXHWaveKeys(speedValue);
if(logo) lg_kbd.setFXColorCycleLogo(speedValue);
lg_kbd.detach();
return 0;
}
return 1;
}
int setFXVWave(string speed) {
int setFXVWave(string speed, bool keys, bool logo) {
Keyboard lg_kbd;
Keyboard::KeyColors colors;
uint8_t speedValue;
if (lg_kbd.parseSpeed(speed, speedValue) == true) {
colors.red = 0xff;
colors.green = 0xff;
colors.blue = 0xff;
lg_kbd.attach();
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXVWave(speedValue);
if(keys) lg_kbd.setFXVWaveKeys(speedValue);
if(logo) lg_kbd.setFXColorCycleLogo(speedValue);
lg_kbd.detach();
return 0;
}
return 1;
}
int setFXCWave(string speed) {
int setFXCWave(string speed, bool keys, bool logo) {
Keyboard lg_kbd;
Keyboard::KeyColors colors;
uint8_t speedValue;
if (lg_kbd.parseSpeed(speed, speedValue) == true) {
colors.red = 0xff;
colors.green = 0xff;
colors.blue = 0xff;
lg_kbd.attach();
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXCWave(speedValue);
if(keys) lg_kbd.setFXCWaveKeys(speedValue);
if(logo) lg_kbd.setFXColorCycleLogo(speedValue);
lg_kbd.detach();
return 0;
}
@ -399,106 +379,84 @@ int parseProfile(istream &is) {
lg_kbd.setKeys(&keys[0], keys.size());
keys.clear();
lg_kbd.commit();
} else if (line.substr(0,8) == "fx-color") {
line = line.substr(9);
} else if (line.substr(0,2) == "fx") {
bool fxkeys = true;
bool fxlogo = true;
line = line.substr(2);
if (line.substr(0,1) == "-") {
line = line.substr(1);
} else if (line.substr(0,2) == "k-") {
fxlogo = false;
line = line.substr(2);
} else if (line.substr(0,2) == "l-") {
fxkeys = false;
line = line.substr(2);
}
if (line.substr(0,5) == "color") {
line = line.substr(6);
if (line.substr(0, 1) == "$") {
ind = line.find(" ");
line = var[line.substr(1, ind - 1)];
} else line = line.substr(0, 6);
if (lg_kbd.parseColor(line, colors) == true) {
keys.clear();
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXColor(colors);
if(fxkeys) lg_kbd.setFXColorKeys(colors);
if(fxlogo) lg_kbd.setFXColorLogo(colors);
} else cout<<"Error on line "<<lineCount<<" : "<<line<<"\n";
} else if (line.substr(0,12) == "fx-breathing") {
line = line.substr(13);
} else if (line.substr(0,9) == "breathing") {
line = line.substr(10);
if (line.substr(0, 1) == "$") {
ind = line.find(" ");
line = var[line.substr(1, ind - 1)] + " " + line.substr(ind + 1);
}
line = var[line.substr(1, ind - 1)] + line.substr(ind);
};
ind = line.find(" ");
if(ind < 6) line.insert(2, "0000");
if (lg_kbd.parseColor(line.substr(0, 6), colors) == true) {
ind = line.find(" ");
line = line.substr(ind + 1, 2);
if (lg_kbd.parseSpeed(line, speedValue) == true) {
keys.clear();
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
if (lg_kbd.parseSpeed(line.substr(0, 2), speedValue) == true) {
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXBreathing(colors, speedValue);
} else cout<<"Error1 on line "<<lineCount<<" : "<<line<<"\n";
} else cout<<"Error2 on line "<<lineCount<<" : "<<line<<"\n";
} else if (line.substr(0,8) == "fx-cycle") {
line = line.substr(9);
if (line.substr(0, 1) == "$") {
ind = line.find(" ");
line = var[line.substr(1, ind - 1)];
} else line = line.substr(0, 2);
if (lg_kbd.parseSpeed(line, speedValue) == true) {
keys.clear();
colors.red = 0xff;
colors.green = 0xff;
colors.blue = 0xff;
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXColorCycle(speedValue);
if(fxkeys) lg_kbd.setFXBreathingKeys(colors, speedValue);
if(fxlogo) lg_kbd.setFXBreathingLogo(colors, speedValue);
} else cout<<"Error on line "<<lineCount<<" : "<<line<<"\n";
} else if (line.substr(0,8) == "fx-hwave") {
line = line.substr(9);
if (line.substr(0, 1) == "$") {
ind = line.find(" ");
line = var[line.substr(1, ind - 1)];
} else line = line.substr(0, 2);
if (lg_kbd.parseSpeed(line, speedValue) == true) {
keys.clear();
colors.red = 0xff;
colors.green = 0xff;
colors.blue = 0xff;
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
} else cout<<"Error on line "<<lineCount<<" : "<<line<<"\n";
} else if (line.substr(0,5) == "cycle") {
line = line.substr(6);
if (lg_kbd.parseSpeed(line.substr(0, 2), speedValue) == true) {
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXHWave(speedValue);
if(fxkeys) lg_kbd.setFXColorCycleKeys(speedValue);
if(fxlogo) lg_kbd.setFXColorCycleLogo(speedValue);
} else cout<<"Error on line "<<lineCount<<" : "<<line<<"\n";
} else if (line.substr(0,8) == "fx-vwave") {
line = line.substr(9);
if (line.substr(0, 1) == "$") {
ind = line.find(" ");
line = var[line.substr(1, ind - 1)];
} else line = line.substr(0, 2);
if (lg_kbd.parseSpeed(line, speedValue) == true) {
keys.clear();
colors.red = 0xff;
colors.green = 0xff;
colors.blue = 0xff;
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
} else if (line.substr(0,5) == "hwave") {
line = line.substr(6);
if (lg_kbd.parseSpeed(line.substr(0, 2), speedValue) == true) {
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXVWave(speedValue);
if(fxkeys) lg_kbd.setFXHWaveKeys(speedValue);
if(fxkeys && fxlogo) lg_kbd.setFXColorCycleLogo(speedValue);
} else cout<<"Error on line "<<lineCount<<" : "<<line<<"\n";
} else if (line.substr(0,8) == "fx-cwave") {
line = line.substr(9);
if (line.substr(0, 1) == "$") {
ind = line.find(" ");
line = var[line.substr(1, ind - 1)];
} else line = line.substr(0, 2);
if (lg_kbd.parseSpeed(line, speedValue) == true) {
keys.clear();
colors.red = 0xff;
colors.green = 0xff;
colors.blue = 0xff;
lg_kbd.setGroupKeys(Keyboard::KeyGroup::indicators, colors);
lg_kbd.commit();
} else if (line.substr(0,5) == "vwave") {
line = line.substr(6);
if (lg_kbd.parseSpeed(line.substr(0, 2), speedValue) == true) {
lg_kbd.detach();
lg_kbd.attach();
lg_kbd.setFXCWave(speedValue);
if(fxkeys) lg_kbd.setFXVWaveKeys(speedValue);
if(fxkeys && fxlogo) lg_kbd.setFXColorCycleLogo(speedValue);
} else cout<<"Error on line "<<lineCount<<" : "<<line<<"\n";
} else if (line.substr(0,5) == "cwave") {
line = line.substr(6);
if (lg_kbd.parseSpeed(line.substr(0, 2), speedValue) == true) {
lg_kbd.detach();
lg_kbd.attach();
if(fxkeys) lg_kbd.setFXCWaveKeys(speedValue);
if(fxkeys && fxlogo) lg_kbd.setFXColorCycleLogo(speedValue);
} else cout<<"Error on line "<<lineCount<<" : "<<line<<"\n";
}
} else if ((line.substr(0, 1) != "#") && (line.substr(0, 1) != "")) {
cout<<"Error on line "<<lineCount<<" : "<<line<<"\n";
}
@ -546,12 +504,21 @@ int main(int argc, char *argv[]) {
else if (argCmd == "-c" && argc == 2) return commit();
else if (argCmd == "-p" && argc == 3) return loadProfile(argv[2]);
else if (argCmd == "-pp" && argc == 2) return pipeProfile();
else if (argCmd == "-fx-color" && argc == 3) return setFXColor(argv[2]);
else if (argCmd == "-fx-breathing" && argc == 4) return setFXBreathing(argv[2], argv[3]);
else if (argCmd == "-fx-cycle" && argc == 3) return setFXColorCycle(argv[2]);
else if (argCmd == "-fx-hwave" && argc == 3) return setFXHWave(argv[2]);
else if (argCmd == "-fx-vwave" && argc == 3) return setFXVWave(argv[2]);
else if (argCmd == "-fx-cwave" && argc == 3) return setFXCWave(argv[2]);
else if (argCmd == "-fx-color" && argc == 3) return setFXColor(argv[2], true, true);
else if (argCmd == "-fx-breathing" && argc == 4) return setFXBreathing(argv[2], argv[3], true, true);
else if (argCmd == "-fx-cycle" && argc == 3) return setFXColorCycle(argv[2], true, true);
else if (argCmd == "-fx-hwave" && argc == 3) return setFXHWave(argv[2], true, true);
else if (argCmd == "-fx-vwave" && argc == 3) return setFXVWave(argv[2], true, true);
else if (argCmd == "-fx-cwave" && argc == 3) return setFXCWave(argv[2], true, true);
else if (argCmd == "-fxk-color" && argc == 3) return setFXColor(argv[2], true, false);
else if (argCmd == "-fxk-breathing" && argc == 4) return setFXBreathing(argv[2], argv[3], true, false);
else if (argCmd == "-fxk-cycle" && argc == 3) return setFXColorCycle(argv[2], true, false);
else if (argCmd == "-fxk-hwave" && argc == 3) return setFXHWave(argv[2], true, false);
else if (argCmd == "-fxk-vwave" && argc == 3) return setFXVWave(argv[2], true, false);
else if (argCmd == "-fxk-cwave" && argc == 3) return setFXCWave(argv[2], true, false);
else if (argCmd == "-fxl-color" && argc == 3) return setFXColor(argv[2], false, true);
else if (argCmd == "-fxl-breathing" && argc == 4) return setFXBreathing(argv[2], argv[3], false, true);
else if (argCmd == "-fxl-cycle" && argc == 3) return setFXColorCycle(argv[2], false, true);
}
usage();
return 1;