From 9ae812b88e7d9f2b36efa0fca7e904a31ea73f73 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Fri, 21 Apr 2017 23:00:21 +0200
Subject: [PATCH] Finalization of g213 support

---
 CONTRIBUTORS.md          | 2 ++
 src/classes/Keyboard.cpp | 7 ++-----
 src/helpers/help.cpp     | 6 ++----
 src/main.cpp             | 5 +++--
 udev/g810-led.rules      | 1 +
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e537304..7a50138 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -46,6 +46,8 @@
 * Improve makefile
 
 ## [pearsonk](https://github.com/pearsonk) :
+* Add g213 protocol (very hard work)
+* Add support of g213
 * Implement underlying device IO as a shared library
 
 ## [wextia](https://github.com/wextia) :
diff --git a/src/classes/Keyboard.cpp b/src/classes/Keyboard.cpp
index 7d02fff..7dae4fd 100644
--- a/src/classes/Keyboard.cpp
+++ b/src/classes/Keyboard.cpp
@@ -435,9 +435,7 @@ bool LedKeyboard::setAllKeys(LedKeyboard::Color color) {
 
 	switch (m_keyboardModel) {
 		case KeyboardModel::g213:
-			for (uint8_t rIndex=0x01; rIndex <= 0x05; rIndex++) {
-				if (! setRegion(rIndex,color)) return false;
-			}
+			for (uint8_t rIndex=0x01; rIndex <= 0x05; rIndex++) if (! setRegion(rIndex, color)) return false;
 			return true;
 		case KeyboardModel::g410:
 		case KeyboardModel::g610:
@@ -531,7 +529,7 @@ bool LedKeyboard::setRegion(uint8_t region, LedKeyboard::Color color) {
 	LedKeyboard::byte_buffer_t data;
 	switch (m_keyboardModel) {
 		case KeyboardModel::g213:
-			data = {0x11, 0xff, 0x0c, 0x3a, region, 0x01, color.red, color.green, color.blue };
+			data = { 0x11, 0xff, 0x0c, 0x3a, region, 0x01, color.red, color.green, color.blue };
 			data.resize(20,0x00);
 			return sendDataInternal(data);
 			break;
@@ -569,7 +567,6 @@ bool LedKeyboard::setNativeEffect(NativeEffect effect, NativeEffectPart part, ui
 	switch (m_keyboardModel) {
 		case KeyboardModel::g213:
 			protocolByte = 0x0c;
-
 			if (part == NativeEffectPart::logo) return false; //Does not have logo component
 			break;
 		case KeyboardModel::g410:
diff --git a/src/helpers/help.cpp b/src/helpers/help.cpp
index dffbd2f..ac3ca0d 100644
--- a/src/helpers/help.cpp
+++ b/src/helpers/help.cpp
@@ -19,8 +19,7 @@ namespace help {
 		cout<<"  -a {color}\t\t\t\tSet all keys color"<<endl;
 		cout<<"  -g {keygroup} {color}\t\t\tSet key group color"<<endl;
 		cout<<"  -k {key} {color}\t\t\tSet key color"<<endl;
-		if (cmdName == "g213-led")
-		{
+		if (cmdName == "g213-led") {
 			cout<<"  -r {region} {color}\t\t\tSet the color of a region for a region-based keyboard"<<endl;
 		}
 		if (cmdName == "g910-led") {
@@ -54,8 +53,7 @@ namespace help {
 			cout<<"color formats :\t\t\t\tII (hex value for intensity)"<<endl;
 		else
 			cout<<"color formats :\t\t\t\tRRGGBB (hex value for red, green and blue)"<<endl;
-		if (cmdName == "g213-led")
-		{
+		if (cmdName == "g213-led") {
 			cout<<"region formats :\t\t\tRN (integer value for region, 1 to 5)"<<endl;
 		}
 		cout<<"speed formats :\t\t\t\tSS (hex value for speed 01 to ff)"<<endl;
diff --git a/src/main.cpp b/src/main.cpp
index 29274ac..e86e109 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,10 +73,9 @@ int setGKeysMode(LedKeyboard &kbd, std::string arg2) {
 int setRegion(LedKeyboard &kbd, std::string arg2, std::string arg3) {
 	uint8_t region = 0;
 	LedKeyboard::Color color;
-
 	if (! utils::parseColor(arg3, color)) return 1;
 	if (! utils::parseUInt8(arg2, region)) return 1;
-	if (kbd.setRegion(region,color)) return 0;
+	if (kbd.setRegion(region, color)) return 0;
 	return 1;
 }
 
@@ -189,6 +188,8 @@ int parseProfile(LedKeyboard &kbd, std::istream &stream) {
 				if (utils::parseKey(args[1], key))
 					if (utils::parseColor(args[2], color))
 						keys.push_back({ key, color });
+			} else if (args[0] == "r" && args.size() > 2) {
+				if (setRegion(kbd, args[1], args[2]) == 1) retval = 1;
 			} else if (args[0] == "mr" && args.size() > 1) {
 				if (setMRKey(kbd, args[1]) == 1) retval = 1;
 			} else if (args[0] == "mn" && args.size() > 1) {
diff --git a/udev/g810-led.rules b/udev/g810-led.rules
index 68ead9d..a4edd40 100644
--- a/udev/g810-led.rules
+++ b/udev/g810-led.rules
@@ -1,3 +1,4 @@
+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c336", MODE="666" RUN+="/usr/bin/g213-led -p /etc/g810-led/profile"
 ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c330", MODE="666" RUN+="/usr/bin/g410-led -p /etc/g810-led/profile"
 ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c333", MODE="666" RUN+="/usr/bin/g610-led -p /etc/g810-led/profile"
 ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c338", MODE="666" RUN+="/usr/bin/g610-led -p /etc/g810-led/profile"