diff --git a/INSTALL.md b/INSTALL.md index ceb841d..02c9786 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -11,11 +11,11 @@ ## hidapi vs libusb :
hidapi is a newer implementation but needs more testing.
hidapi is more responsive than libusb (~20ms vs ~150ms).
-hidapi seem not work on CentOS, writing on hidraw is not allowed.
-hidapi is recommended but if you encounter problem on your system, switch to libusb.
+hidapi seems to not work on CentOS, writing to hidraw is not allowed.
+hidapi is recommended but if you encounter a problem on your system, switch to libusb.
-## Installation by repos :
+## Installation using repos :
ArchLinux (aur) :
`yaourt -S g810-led-git` # with yaourt
`pacaur -S g810-led-git` # with pacaur
@@ -39,7 +39,7 @@ Fedora :
`make bin LIB=libusb` # for libusb
`sudo make install`
-## Installation of the library (For developpers) :
+## Installation of the library (For developers) :
`make lib` # for hidapi
`make lib LIB=libusb` # for libusb
`sudo make install-lib` to install the libg810-led library.
@@ -53,8 +53,7 @@ Same as install, but your profile and reboot files are preserved.
## Boot profiles :
On boot, the keyboard is set with the udev file /etc/udev/rules.d/g810-led.rules
-This file launch the profile stored in /etc/g810-led/profile
-To prevent your keyboard to flash 3 time when you reboot, a systemd unit (g810-led-reboot) is available for this.
-It launch the profile stored in /etc/g810-led/reboot
+This file launches the profile stored in /etc/g810-led/profile
+To prevent your keyboard flashing 3 times when you reboot use the systemd unit (g810-led-reboot).
Samples can be found in /etc/g810-led/samples.
diff --git a/README.md b/README.md index 494a373..9d653d4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ # g810-led
-Linux led controller for Logitech G213, G410, G610, G810, G910 and GPRO Keyboards.
+Linux led controller for Logitech G213, G410, G413, G512, G513, G610, G810, G910 and GPRO Keyboards.
## Compatible keyboards :
- **G213 Prodigy**
- **G410 Atlas Spectrum**
- **G413 Carbon**
+- **G512 Carbon**
+- **G513 Carbon**
- **G610 Orion Brown**
- **G610 Orion Red**
- **G810 Orion Spectrum**
@@ -22,6 +24,9 @@ Linux led controller for Logitech G213, G410, G610, G810, G910 and GPRO Keyboard ## Help :
`g213-led --help`
`g410-led --help`
+`g413-led --help`
+`g512-led --help`
+`g513-led --help`
`g610-led --help`
`g810-led --help`
`g910-led --help`
@@ -53,12 +58,12 @@ Linux led controller for Logitech G213, G410, G610, G810, G910 and GPRO Keyboard `g810-led -kn d ff0000 # Set color of a key with no action`
`g810-led -c # Commit all changes`
-## Samples for g610 :
+## Samples for G610 :
`g610-led -a 60 # Set intensity of all keys`
`g610-led -k logo ff # Set intensity of a key`
`g610-led -g fkeys aa # Set intensity of a group of keys`
-## Samples for g213 :
+## Samples for G213 :
`g213-led -a 00ff00 # Set all keys green`
`g213-led -r 1 ff0000 # Set region 1 red`
@@ -67,7 +72,7 @@ Linux led controller for Logitech G213, G410, G610, G810, G910 and GPRO Keyboard `echo -e "k w ff0000\nk a ff0000\nk s ff0000\nk d ff0000\nc" | g810-led -pp # Set multiple keys`
## Testing unsuported keyboards :
-Start by retrieve the VendorID and the ProductID of your keyboard with lsusb.
+Start by retrieving the VendorID and the ProductID of your keyboard using lsusb.
`lsusb`
Sample return :
`Bus 001 Device 001: ID 046d:c331 Logitech, Inc.`
diff --git a/makefile b/makefile index 98438d8..14432db 100644 --- a/makefile +++ b/makefile @@ -1,19 +1,19 @@ -CC=g++ -CFLAGS=-Wall -O2 -std=gnu++11 +CXX?=g++ +CXXFLAGS?=-Wall -O2 LIB?=hidapi ifeq ($(LIB),libusb) CPPFLAGS=-Dlibusb - LDFLAGS=-lusb-1.0 + LIBS=-lusb-1.0 else CPPFLAGS=-Dhidapi - LDFLAGS=-lhidapi-hidraw + LIBS=-lhidapi-hidraw endif SYSTEMDDIR?=/usr/lib/systemd SYSTEMD_SLEEP_DIR?=/lib/systemd/system-sleep -prefix?=$(DESTDIR)/usr -libdir?=$(prefix)/lib -includedir?=$(prefix)/include +PREFIX?=$(DESTDIR)/usr +libdir?=$(PREFIX)/lib +includedir?=$(PREFIX)/include # Program & versioning information PROGN=g810-led @@ -21,7 +21,7 @@ MAJOR=0 MINOR=2 MICRO=8 -CFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\" +CXXFLAGS+=-std=gnu++11 -DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\" APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h LIBSRCS=src/classes/*.cpp src/classes/*.h @@ -33,19 +33,19 @@ bin: bin/$(PROGN) bin/$(PROGN): $(APPSRCS) $(LIBSRCS) @mkdir -p bin - $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) -debug: CFLAGS += -g -Wextra -pedantic +debug: CXXFLAGS += -g -Wextra -pedantic debug: bin/$(PROGN) lib/lib$(PROGN).so: $(LIBSRCS) @mkdir -p lib - $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS) @ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so bin-linked: lib/lib$(PROGN).so @mkdir -p bin - $(CC) $(CPPFLAGS) $(CFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LIBS) -L./lib -l$(PROGN) lib: lib/lib$(PROGN).so @@ -62,6 +62,8 @@ setup: @test -s $(DESTDIR)/usr/bin/g213-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g213-led @test -s $(DESTDIR)/usr/bin/g410-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g410-led @test -s $(DESTDIR)/usr/bin/g413-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g413-led + @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/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 @@ -111,6 +113,9 @@ uninstall: @rm /usr/bin/g213-led @rm /usr/bin/g410-led @rm /usr/bin/g413-led + @rm /usr/bin/g413-led + @rm /usr/bin/g512-led + @rm /usr/bin/g513-led @rm /usr/bin/g610-led @rm /usr/bin/g910-led @rm /usr/bin/gpro-led diff --git a/src/classes/Keyboard.cpp b/src/classes/Keyboard.cpp index f657b2d..9c54f9d 100644 --- a/src/classes/Keyboard.cpp +++ b/src/classes/Keyboard.cpp @@ -358,6 +358,7 @@ bool LedKeyboard::commit() { case KeyboardModel::g413: return true; // Keyboard is non-transactional case KeyboardModel::g410: + case KeyboardModel::g513: case KeyboardModel::g610: case KeyboardModel::g810: case KeyboardModel::gpro: @@ -569,6 +570,7 @@ bool LedKeyboard::setAllKeys(LedKeyboard::Color color) { setNativeEffect(NativeEffect::color, NativeEffectPart::keys, 0, color); return true; case KeyboardModel::g410: + case KeyboardModel::g513: case KeyboardModel::g610: case KeyboardModel::g810: case KeyboardModel::g910: @@ -731,6 +733,7 @@ bool LedKeyboard::setNativeEffect(NativeEffect effect, NativeEffectPart part, ui if (part == NativeEffectPart::logo) return true; //Does not have logo component break; case KeyboardModel::g410: + case KeyboardModel::g513: case KeyboardModel::g610: // Unconfirmed case KeyboardModel::g810: case KeyboardModel::gpro: @@ -856,6 +859,7 @@ LedKeyboard::byte_buffer_t LedKeyboard::getKeyGroupAddress(LedKeyboard::KeyAddre case KeyboardModel::g413: return {}; // Device doesn't support per-key setting case KeyboardModel::g410: + case KeyboardModel::g513: case KeyboardModel::g610: case KeyboardModel::g810: case KeyboardModel::gpro: diff --git a/src/classes/Keyboard.h b/src/classes/Keyboard.h index 5e6dca8..76e178f 100644 --- a/src/classes/Keyboard.h +++ b/src/classes/Keyboard.h @@ -31,6 +31,7 @@ class LedKeyboard { { 0x46d, 0xc336, (u_int16_t)KeyboardModel::g213 }, { 0x46d, 0xc330, (u_int16_t)KeyboardModel::g410 }, { 0x46d, 0xc33a, (u_int16_t)KeyboardModel::g413 }, + { 0x46d, 0xc33c, (u_int16_t)KeyboardModel::g513 }, { 0x46d, 0xc333, (u_int16_t)KeyboardModel::g610 }, { 0x46d, 0xc338, (u_int16_t)KeyboardModel::g610 }, { 0x46d, 0xc331, (u_int16_t)KeyboardModel::g810 }, @@ -45,6 +46,7 @@ class LedKeyboard { g213, g410, g413, + g513, g610, g810, g910, diff --git a/udev/g810-led.rules b/udev/g810-led.rules index b585a5e..20eb7f7 100644 --- a/udev/g810-led.rules +++ b/udev/g810-led.rules @@ -1,7 +1,7 @@ ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c336", GROUP="input" RUN+="/usr/bin/g213-led -p /etc/g810-led/profile" ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c330", GROUP="input" RUN+="/usr/bin/g410-led -p /etc/g810-led/profile" ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c33a", GROUP="input" RUN+="/usr/bin/g413-led -p /etc/g810-led/profile" -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c333", GROUP="input" RUN+="/usr/bin/g610-led -p /etc/g810-led/profile" +ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c33c", GROUP="input" RUN+="/usr/bin/g513-led -p /etc/g810-led/profile" ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c338", GROUP="input" RUN+="/usr/bin/g610-led -p /etc/g810-led/profile" ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c331", GROUP="input" RUN+="/usr/bin/g810-led -p /etc/g810-led/profile" ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c337", GROUP="input" RUN+="/usr/bin/g810-led -p /etc/g810-led/profile"