Merge 48b9406d59 into ca1ecadf98

makefile

@@ -2,10 +2,10 @@ CC=g++
 CFLAGS=-Wall -O2 -std=gnu++11
 LIB?=hidapi
 ifeq ($(LIB),libusb)
-	CPPFLAGS=-Dlibusb
+	CPPFLAGS=-Dlibusb -lpthread
 	LDFLAGS=-lusb-1.0
 else
-	CPPFLAGS=-Dhidapi
+	CPPFLAGS=-Dhidapi -lpthread
 	LDFLAGS=-lhidapi-hidraw
 endif
 SYSTEMDDIR?=/usr/lib/systemd

src/classes/CustomEffects.cpp

@@ -0,0 +1,112 @@
+#include "CustomEffects.h"
+
+#include "Keyboard.h"
+
+#include <atomic>
+#include <chrono>
+#include <functional>
+#include <thread>
+#include <vector>
+
+// Global variables to know when a user activate input
+std::atomic< bool > KeyPressed;
+
+void Test1Effects( LedKeyboard& kbd )
+{
+	LedKeyboard::Key key = LedKeyboard::Key::r;
+	LedKeyboard::Color color;
+	color.red = 0;
+	color.green = 0;
+	color.blue = 0;
+	
+	while ( !KeyPressed )
+	{
+		++color.red;
+		LedKeyboard::KeyValue keyValue = { key, color };
+		if (! kbd.open()) return;
+		if (! kbd.setKey(keyValue)) return;
+		if(! kbd.commit()) return;
+		
+		//std::cout << "TEST" << std::endl;
+		std::this_thread::sleep_for ( std::chrono::milliseconds( 10 ) );
+	}
+}
+
+void Test2Effects( LedKeyboard& kbd )
+{
+	LedKeyboard::Key key = LedKeyboard::Key::t;
+	LedKeyboard::Color color;
+	color.red = 0;
+	color.green = 0;
+	color.blue = 0;
+	
+	while ( !KeyPressed )
+	{
+		++color.blue;
+		LedKeyboard::KeyValue keyValue = { key, color };
+		if (! kbd.open()) return;
+		if (! kbd.setKey(keyValue)) return;
+		if(! kbd.commit()) return;
+		
+		//std::cout << "TEST" << std::endl;
+		std::this_thread::sleep_for ( std::chrono::milliseconds( 10 ) );
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+
+int StartEffectsAndWaitForUser( LedKeyboard& kbd, std::vector< std::function< void( LedKeyboard& ) > >& EffectFunctions )
+{
+	if ( EffectFunctions.size() == 0 )
+	{
+		std::cout << "No effects to apply." << std::endl;
+		return 1;
+	}
+	
+	// Start all the effects on a thread
+	std::vector< std::thread > ThreadList;
+	for( unsigned int i = 0; i < EffectFunctions.size(); ++i )
+	{
+		ThreadList.emplace_back( EffectFunctions[i], std::ref( kbd ) );
+	}
+	
+	// Wait for user input
+	std::cout << "Press enter to quit";
+	getchar();
+	
+	// Stop the threads and wait for them to finish
+	KeyPressed = true;
+	for( unsigned int i = 0; i < ThreadList.size(); ++i )
+	{
+		ThreadList[i].join();
+	}
+	
+	return 0;
+}
+
+
+int StartCustomEffects( LedKeyboard& kbd, int argc, char** argv )
+{
+	if ( argc < 1 )
+	{
+		// Not enough parameters
+		return 1;
+	}
+	KeyPressed = false;
+	
+	// Each arguments is an effects. Check all the arguments to get the list of all wanted effects
+	std::vector< std::function< void( LedKeyboard& ) > > EffectFunctions;
+	for ( int i = 0; i < argc; ++i )
+	{
+		std::string Type = argv[i];
+		if ( Type == "test1" ) EffectFunctions.emplace_back( Test1Effects );
+		else if ( Type == "test2" ) EffectFunctions.emplace_back( Test2Effects );
+		else
+		{
+			// No custom effects of this name
+			std::cout << "No effects of name: " << Type << std::endl;
+		}
+	}
+	
+	return StartEffectsAndWaitForUser( kbd, EffectFunctions );
+}

src/classes/CustomEffects.h

@@ -0,0 +1,12 @@
+#ifndef __CUSTOM_EFFECTS__
+#define __CUSTOM_EFFECTS__
+
+#include <iostream>
+
+class LedKeyboard;
+
+// Start the custom effects and wait for user input before quitting.
+// Assume the given arg are ONLY refering to the effects (so the program name and arguments are ommited).
+int StartCustomEffects( LedKeyboard& kbd, int argc, char** argv );
+
+#endif // __CUSTOM_EFFECTS__

src/helpers/help.cpp

@@ -36,6 +36,8 @@ namespace help {
 		cout<<endl;
 		cout<<"  -fx ...\t\t\t\tUse --help-effects for more detail"<<endl;
 		cout<<endl;
+		cout<<"  -cfx ...\t\t\t\tUse --help-custom-effects for more detail"<<endl;
+		cout<<endl;
 		cout<<"  < {profile}\t\t\t\tSet a profile from a file (use --help-samples for more detail)"<<endl;
 		cout<<"  |\t\t\t\t\tSet a profile from stdin (for scripting) (use --help-samples for more detail)"<<endl;
 		cout<<endl;
@@ -254,4 +256,17 @@ namespace help {
 		cout<<"echo -e \"k w ff0000\\nk a ff0000\\nk s ff0000\\nk d ff0000\\nc\" | g810-led -pp # Set multiple keys"<<endl;
 	}
 	
+	void custom_effects(char *arg0)
+	{
+		string cmdName = utils::getCmdName(arg0);
+		cout<<cmdName<<" Custom Effects"<<endl;
+		cout<<"----------------"<<endl;
+		cout<<endl;
+		cout<<"  -cfx {effect1} [{effect2} ...]"<<endl;
+		cout<<endl;
+		cout<<"  One effect can be used, or multiple."<<endl;
+		cout<<"  Valid custom effects: test1, test2"<<endl;
+		cout<<endl;
+	}
+	
 }

src/helpers/help.h

@@ -9,6 +9,7 @@ namespace help {
 	void keys(char *arg0);
 	void effects(char *arg0);
 	void samples(char *arg0);
+	void custom_effects(char *arg0);
 	
 }
 

src/main.cpp

@@ -6,6 +6,7 @@
 #include "helpers/help.h"
 #include "helpers/utils.h"
 #include "classes/Keyboard.h"
+#include "classes/CustomEffects.h"
 
 
 int commit(LedKeyboard &kbd) {
@@ -234,6 +235,7 @@ int main(int argc, char **argv) {
 		else if (arg == "--help-keys") help::keys(argv[0]);
 		else if (arg == "--help-effects") help::effects(argv[0]);
 		else if (arg == "--help-samples") help::samples(argv[0]);
+		else if (arg == "--help-custom-effects") help::custom_effects(argv[0]);
 		
 		else {
 			LedKeyboard kbd;
@@ -258,6 +260,8 @@ int main(int argc, char **argv) {
 			else if (argc > 5 && arg == "-fx") return setFX(kbd, argv[2], argv[3], argv[4], argv[5]);
 			else if (argc > 4 && arg == "-fx") return setFX(kbd, argv[2], argv[3], argv[4]);
 			
+			else if (argc > 2 && arg == "-cfx") return StartCustomEffects( kbd, argc - 2, argv + 2 );
+			
 			else if (argc > 2 && arg == "--startup-mode") return setStartupMode(kbd, argv[2]);
 			
 			else { help::usage(argv[0]); return 1; }