Merge branch 'master' of git://github.com/yuhu-/ebusd

src/lib/ebus/test/test_commands.cpp

@@ -51,7 +51,7 @@ void readCSV(std::istream& is, Commands& commands){
 
 int main()
 {
-	Commands* commands = ConfigCommands("test", CSV).getCommands();
+	Commands* commands = ConfigCommands("test", ft_csv).getCommands();
 	std::cout << "Commands: " << commands->sizeCmdDB() << std::endl;
 
 	//~ std::string data("g ci password pin1");

src/lib/ebus/test/test_configfile.cpp

@@ -27,7 +27,7 @@
 int main() {
 
 	std::string dir("test");
-	ConfigCommands config(dir, CSV);
+	ConfigCommands config(dir, ft_csv);
 
 	Commands* commands = config.getCommands();