X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fdriver.cpp;h=6fbef93e1f13be64a90afcf3fb5a0037d11fe04a;hb=d0881a98a6240758ac1aeceaa9443d718ab1ad5c;hp=22b241c61a5c8bf51faaa5101c8ed738d6483ddf;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/libr2c2/driver.cpp b/source/libr2c2/driver.cpp
index 22b241c..6fbef93 100644
--- a/source/libr2c2/driver.cpp
+++ b/source/libr2c2/driver.cpp
@@ -1,10 +1,12 @@
-#include <msp/core/except.h>
+#include <msp/strings/utils.h>
+#include "arducontrol.h"
 #include "centralstation.h"
 #include "driver.h"
 #include "dummy.h"
 #include "intellibox.h"
 
 using namespace std;
+using namespace Msp;
 
 namespace R2C2 {
 
@@ -21,10 +23,34 @@ Driver *Driver::create(const string &str)
 		return new Intellibox(params);
 	else if(type=="cs" || type=="centralstation")
 		return new CentralStation(params);
+	else if(type=="ac" || type=="arducontrol")
+		return new ArduControl(params);
 	else if(type=="dummy")
-		return new Dummy;
+		return new Dummy(params);
 
-	throw Msp::InvalidParameterValue("Unknown driver");
+	throw invalid_argument("Driver::create");
+}
+
+
+Driver::Options::Options(const string &optstr)
+{
+	vector<string> parts = split(optstr, ':');
+	for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	{
+		string::size_type equals = i->find('=');
+		if(equals==0)
+			throw invalid_argument("Driver::Options::Options");
+
+		if(equals==string::npos)
+			set(string(), *i);
+		else
+			set(i->substr(0, equals), i->substr(equals+1));
+	}
+}
+
+void Driver::Options::set(const string &key, const string &value)
+{
+	opts[key] = value;
 }
 
 } // namespace R2C2