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

Merge branch 'cornernote-develop' into g815

Browse Source
This commit is contained in:
MatMoul 2020-04-25 17:41:36 +02:00
commit 81aff33c1f
9 changed files with 121 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -64,6 +64,7 @@ setup:
@test -s $(DESTDIR)/usr/bin/g512-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g512-led
@test -s $(DESTDIR)/usr/bin/g513-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g513-led
@test -s $(DESTDIR)/usr/bin/g610-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g610-led
@test -s $(DESTDIR)/usr/bin/g815-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g815-led
@test -s $(DESTDIR)/usr/bin/g910-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g910-led
@test -s $(DESTDIR)/usr/bin/gpro-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/gpro-led
@cp sample_profiles/* $(DESTDIR)/etc/$(PROGN)/samples
@ -111,6 +112,7 @@ uninstall:
@rm /usr/bin/g512-led
@rm /usr/bin/g513-led
@rm /usr/bin/g610-led
@rm /usr/bin/g815-led
@rm /usr/bin/g910-led
@rm /usr/bin/gpro-led
@rm /usr/bin/$(PROGN)

80
src/classes/Keyboard.cpp
View File

@ -377,10 +377,12 @@ bool LedKeyboard::commit() {
case KeyboardModel::g513:
case KeyboardModel::g610:
case KeyboardModel::g810:
case KeyboardModel::g815:
case KeyboardModel::gpro:
data = { 0x11, 0xff, 0x0c, 0x5a };
break;
case KeyboardModel::g815:
data = { 0x11, 0xff, 0x10, 0x7f };
break;
case KeyboardModel::g910:
data = { 0x11, 0xff, 0x0f, 0x5d };
break;
@ -414,6 +416,7 @@ bool LedKeyboard::setKeys(KeyValueArray keyValues) {
switch (currentDevice.model) {
case LedKeyboard::KeyboardModel::g610:
case LedKeyboard::KeyboardModel::g810:
case LedKeyboard::KeyboardModel::g815:
case LedKeyboard::KeyboardModel::gpro:
if (SortedKeys[0].size() <= 1 && keyValues[i].key == LedKeyboard::Key::logo)
SortedKeys[0].push_back(keyValues[i]);
@ -432,6 +435,7 @@ bool LedKeyboard::setKeys(KeyValueArray keyValues) {
switch (currentDevice.model) {
case LedKeyboard::KeyboardModel::g610:
case LedKeyboard::KeyboardModel::g810:
case LedKeyboard::KeyboardModel::g815:
case LedKeyboard::KeyboardModel::gpro:
if (SortedKeys[2].size() <= 5) SortedKeys[2].push_back(keyValues[i]);
break;
@ -441,6 +445,7 @@ bool LedKeyboard::setKeys(KeyValueArray keyValues) {
break;
case LedKeyboard::KeyAddressGroup::gkeys:
switch (currentDevice.model) {
case LedKeyboard::KeyboardModel::g815:
case LedKeyboard::KeyboardModel::g910:
if (SortedKeys[3].size() <= 9) SortedKeys[3].push_back(keyValues[i]);
break;
@ -453,14 +458,15 @@ bool LedKeyboard::setKeys(KeyValueArray keyValues) {
case LedKeyboard::KeyboardModel::g513:
case LedKeyboard::KeyboardModel::g610:
case LedKeyboard::KeyboardModel::g810:
case LedKeyboard::KeyboardModel::g815:
case LedKeyboard::KeyboardModel::g910:
case LedKeyboard::KeyboardModel::gpro:
if (SortedKeys[4].size() <= 120) SortedKeys[4].push_back(keyValues[i]);
break;
case LedKeyboard::KeyboardModel::g410:
if (SortedKeys[4].size() <= 120)
if (keyValues[i].key < LedKeyboard::Key::num_lock ||
keyValues[i].key > LedKeyboard::Key::num_dot)
if (keyValues[i].key < LedKeyboard::Key::num_lock ||
keyValues[i].key > LedKeyboard::Key::num_dot)
SortedKeys[4].push_back(keyValues[i]);
break;
default:
@ -594,9 +600,10 @@ bool LedKeyboard::setAllKeys(LedKeyboard::Color color) {
NativeEffectStorage::none);
return true;
case KeyboardModel::g410:
case KeyboardModel::g513:
case KeyboardModel::g513:
case KeyboardModel::g610:
case KeyboardModel::g810:
case KeyboardModel::g815:
case KeyboardModel::g910:
case KeyboardModel::gpro:
for (uint8_t i = 0; i < keyGroupLogo.size(); i++) keyValues.push_back({keyGroupLogo[i], color});
@ -620,6 +627,17 @@ bool LedKeyboard::setAllKeys(LedKeyboard::Color color) {
bool LedKeyboard::setMRKey(uint8_t value) {
LedKeyboard::byte_buffer_t data;
switch (currentDevice.model) {
case KeyboardModel::g815:
switch (value) {
case 0x00:
case 0x01:
data = { 0x11, 0xff, 0x0c, 0x0c, value };
data.resize(20, 0x00);
return sendDataInternal(data);
default:
break;
}
break;
case KeyboardModel::g910:
switch (value) {
case 0x00:
@ -640,6 +658,24 @@ bool LedKeyboard::setMRKey(uint8_t value) {
bool LedKeyboard::setMNKey(uint8_t value) {
LedKeyboard::byte_buffer_t data;
switch (currentDevice.model) {
case KeyboardModel::g815:
switch (value) {
case 0x01:
data = { 0x11, 0xff, 0x0b, 0x1c, 0x01 };
data.resize(20, 0x00);
return sendDataInternal(data);
case 0x02:
data = { 0x11, 0xff, 0x0b, 0x1c, 0x02 };
data.resize(20, 0x00);
return sendDataInternal(data);
case 0x03:
data = { 0x11, 0xff, 0x0b, 0x1c, 0x04 };
data.resize(20, 0x00);
return sendDataInternal(data);
default:
break;
}
break;
case KeyboardModel::g910:
switch (value) {
case 0x00:
@ -666,6 +702,17 @@ bool LedKeyboard::setMNKey(uint8_t value) {
bool LedKeyboard::setGKeysMode(uint8_t value) {
LedKeyboard::byte_buffer_t data;
switch (currentDevice.model) {
case KeyboardModel::g815:
switch (value) {
case 0x00:
case 0x01:
data = { 0x11, 0xff, 0x0a, 0x2b, value };
data.resize(20, 0x00);
return sendDataInternal(data);
default:
break;
}
break;
case KeyboardModel::g910:
switch (value) {
case 0x00:
@ -719,6 +766,17 @@ bool LedKeyboard::setStartupMode(StartupMode startupMode) {
return sendDataInternal(data);
}
bool LedKeyboard::setOnBoardMode(OnBoardMode onBoardMode) {
byte_buffer_t data;
switch (currentDevice.model) {
case KeyboardModel::g815:
data = { 0x11, 0xff, 0x11, 0x1a, onBoardMode };
data.resize(20, 0x00);
return sendDataInternal(data);
default:
return false;
}
}
bool LedKeyboard::setNativeEffect(NativeEffect effect, NativeEffectPart part,
std::chrono::duration<uint16_t, std::milli> period, Color color,
@ -940,6 +998,20 @@ LedKeyboard::byte_buffer_t LedKeyboard::getKeyGroupAddress(LedKeyboard::KeyAddre
return { 0x12, 0xff, 0x0c, 0x3a, 0x00, 0x01, 0x00, 0x0e };
}
break;
case KeyboardModel::g815:
switch (keyAddressGroup) {
case LedKeyboard::KeyAddressGroup::logo:
return { 0x11, 0xff, 0x0c, 0x3a, 0x00, 0x10, 0x00, 0x01 };
case LedKeyboard::KeyAddressGroup::indicators:
return { 0x12, 0xff, 0x0c, 0x3a, 0x00, 0x40, 0x00, 0x05 };
case LedKeyboard::KeyAddressGroup::gkeys:
return {};
case LedKeyboard::KeyAddressGroup::multimedia:
return { 0x12, 0xff, 0x0c, 0x3a, 0x00, 0x02, 0x00, 0x05 };
case LedKeyboard::KeyAddressGroup::keys:
return { 0x12, 0xff, 0x0c, 0x3a, 0x00, 0x01, 0x00, 0x0e };
}
break;
case KeyboardModel::g910:
switch (keyAddressGroup) {
case LedKeyboard::KeyAddressGroup::logo:

5
src/classes/Keyboard.h
View File

@ -78,6 +78,10 @@ class LedKeyboard {
wave = 0x01,
color
};
enum class OnBoardMode : uint8_t {
board = 0x01,
software
};
enum class NativeEffectGroup : uint8_t {
off,
color,
@ -201,6 +205,7 @@ class LedKeyboard {
bool setRegion(uint8_t region, Color color);
bool setStartupMode(StartupMode startupMode);
bool setOnBoardMode(OnBoardMode onBoardMode);
bool setNativeEffect(NativeEffect effect, NativeEffectPart part,
std::chrono::duration<uint16_t, std::milli> period, Color color,

9
src/helpers/help.cpp
View File

@ -35,6 +35,7 @@ namespace help {
else if(cmdName == "g513-led") return KeyboardFeatures::g513;
else if(cmdName == "g610-led") return KeyboardFeatures::g610;
else if(cmdName == "g810-led") return KeyboardFeatures::g810;
else if(cmdName == "g815-led") return KeyboardFeatures::g815;
else if(cmdName == "g910-led") return KeyboardFeatures::g910;
else if(cmdName == "gpro-led") return KeyboardFeatures::gpro;
return KeyboardFeatures::all;
@ -89,6 +90,10 @@ namespace help {
cout<<" --startup-mode {startup mode}\t\tSet startup mode"<<endl;
cout<<endl;
}
if((features | KeyboardFeatures::onboardmode) == features) {
cout<<" --on-board-mode {on-board mode}\t\tSet on-board mode"<<endl;
cout<<endl;
}
cout<<" --list-keyboards \t\t\tList connected keyboards"<<endl;
cout<<" --print-device\t\t\tPrint device information for the keyboard"<<endl;
cout<<endl;
@ -119,6 +124,7 @@ namespace help {
if((features | KeyboardFeatures::setgroup) == features)
cout<<" group values :\t\t\tlogo, indicators, fkeys, ... (use --help-keys for more detail)"<<endl;
cout<<" startup mode :\t\t\twave, color"<<endl;
cout<<" on-board mode :\t\t\tboard, software"<<endl;
cout<<endl;
}
@ -323,6 +329,9 @@ namespace help {
if((features | KeyboardFeatures::poweronfx) == features)
cout<<cmdName<<" --startup-mode color # Set keyboard power on effect"<<endl;
cout<<endl;
if((features | KeyboardFeatures::onboardmode) == features)
cout<<cmdName<<" --on-board-mode color # Set keyboard power on effect"<<endl;
cout<<endl;
if((features | KeyboardFeatures::commit) == features) {
cout<<"Samples with no commit :"<<endl;
if((features | KeyboardFeatures::setall) == features)

4
src/helpers/help.h
View File

@ -39,10 +39,11 @@ namespace help {
poweronfx = 8192,
// "user-stored lighting" can be recalled with backlight+7 on the G Pro
userstoredlighting = 16384,
onboardmode = 32768,
// fx features
all = rgb | intensity | commit | logo1 | logo2 | numpad | multimedia | gkeys |
setall | setgroup | setkey | setregion | setindicators | poweronfx | userstoredlighting,
setall | setgroup | setkey | setregion | setindicators | poweronfx | userstoredlighting | onboardmode,
g213 = rgb | logo1 | numpad | multimedia | setall | setregion | setindicators | poweronfx | userstoredlighting,
g410 = rgb | commit | setall | setgroup | setkey | poweronfx | userstoredlighting,
@ -50,6 +51,7 @@ namespace help {
g513 = rgb | commit | numpad | setall | setgroup | setkey | setindicators | poweronfx | userstoredlighting,
g610 = intensity | commit | logo1 | numpad | multimedia | setall | setgroup | setkey | setindicators | poweronfx | userstoredlighting,
g810 = rgb | commit | logo1 | numpad | multimedia | setall | setgroup | setkey | setindicators | poweronfx,
g815 = rgb | commit | logo1 | numpad | multimedia | gkeys | setall | setgroup | setkey | setindicators | onboardmode,
g910 = rgb | commit | logo1 | logo2 | numpad | multimedia | gkeys | setall | setgroup | setkey | setindicators | poweronfx | userstoredlighting,
gpro = rgb | commit | logo1 | setall | setgroup | setkey | setindicators | poweronfx | userstoredlighting
};

13
src/helpers/utils.cpp
View File

@ -27,15 +27,22 @@ namespace utils {
std::string getCmdName(std::string cmd) {
return cmd.substr(cmd.find_last_of("/\\") + 1);
}
bool parseStartupMode(std::string val, LedKeyboard::StartupMode &startupMode) {
if (val == "wave") startupMode = LedKeyboard::StartupMode::wave;
else if (val == "color") startupMode = LedKeyboard::StartupMode::color;
else return false;
return true;
}
bool parseOnBoardMode(std::string val, LedKeyboard::OnBoardMode &onBoardMode) {
if (val == "software") onBoardMode = LedKeyboard::OnBoardMode ::software;
else if (val == "board") onBoardMode = LedKeyboard::OnBoardMode::board;
else return false;
return true;
}
bool parseNativeEffect(std::string val, LedKeyboard::NativeEffect &nativeEffect) {
if (val == "color") nativeEffect = LedKeyboard::NativeEffect::color;

3
src/helpers/utils.h
View File

@ -24,8 +24,9 @@
namespace utils {
std::string getCmdName(std::string cmd);
bool parseStartupMode(std::string val, LedKeyboard::StartupMode &startupMode);
bool parseOnBoardMode(std::string val, LedKeyboard::OnBoardMode &onBoardMode);
bool parseNativeEffect(std::string val, LedKeyboard::NativeEffect &nativeEffect);
bool parseNativeEffectPart(std::string val, LedKeyboard::NativeEffectPart &nativeEffectPart);
bool parseKey(std::string val, LedKeyboard::Key &key);

13
src/main.cpp
View File

@ -171,6 +171,14 @@ int setStartupMode(LedKeyboard &kbd, std::string arg2) {
return 1;
}
int setOnBoardMode(LedKeyboard &kbd, std::string arg2) {
LedKeyboard::OnBoardMode onBoardMode;
if (! utils::parseOnBoardMode(arg2, onBoardMode)) return 1;
if (! kbd.open()) return 1;
if (kbd.setOnBoardMode(onBoardMode)) return 0;
return 1;
}
int parseProfile(LedKeyboard &kbd, std::istream &stream) {
std::string line;
@ -217,6 +225,10 @@ int parseProfile(LedKeyboard &kbd, std::istream &stream) {
if (setMNKey(kbd, args[1]) == 1) retval = 1;
} else if (args[0] == "gkm" && args.size() > 1) {
if (setGKeysMode(kbd, args[1]) == 1) retval = 1;
} else if (args[0] == "sm" && args.size() > 1) {
if (setStartupMode(kbd, args[1]) == 1) retval = 1;
} else if (args[0] == "obm" && args.size() > 1) {
if (setOnBoardMode(kbd, args[1]) == 1) retval = 1;
} else if (args[0] == "fx" && args.size() > 4) {
if (setFX(kbd, args[1], args[2], args[3], args[4]) == 1) retval = 1;
} else if (args[0] == "fx" && args.size() > 3) {
@ -334,6 +346,7 @@ int main(int argc, char **argv) {
else if (argc > (argIndex + 3) && arg == "-fx-store")
return storeFX(kbd, argv[argIndex + 1], argv[argIndex + 2], argv[argIndex + 3]);
else if (argc > (argIndex + 1) && arg == "--startup-mode") return setStartupMode(kbd, argv[argIndex + 1]);
else if (argc > (argIndex + 1) && arg == "--on-board-mode") return setOnBoardMode(kbd, argv[argIndex + 1]);
else { help::usage(argv[0]); return 1; }
}

1
udev/g810-led.rules
View File

@ -6,6 +6,7 @@ ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c3
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c338", MODE="666" RUN+="/usr/bin/g610-led -p /etc/g810-led/profile"
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c331", MODE="666" RUN+="/usr/bin/g810-led -p /etc/g810-led/profile"
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c337", MODE="666" RUN+="/usr/bin/g810-led -p /etc/g810-led/profile"
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c33f", MODE="666" RUN+="/usr/bin/g815-led -p /etc/g810-led/profile"
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c32b", MODE="666" RUN+="/usr/bin/g910-led -p /etc/g810-led/profile"
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c335", MODE="666" RUN+="/usr/bin/g910-led -p /etc/g810-led/profile"
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c339", MODE="666" RUN+="/usr/bin/gpro-led -p /etc/g810-led/profile"