X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farducontrol.cpp;h=ecac7b81e69fb14b6faa435d9c3753f538d7053b;hb=2c08ce7d004b20a1cd9bc68fccbf734a6ba2d242;hp=dd4e0574eb7d52c4714e8740db3e99c20be40ed8;hpb=7ff47d1f59711542f4943aef02655d1bee51a8f6;p=r2c2.git

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index dd4e057..ecac7b8 100644
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -18,8 +18,8 @@ ArduControl::ProtocolInfo ArduControl::protocol_info[2] =
 	{ 0x3FFF, 126, 15 }  // MFX
 };
 
-ArduControl::ArduControl(const string &dev):
-	serial(dev),
+ArduControl::ArduControl(const Options &opts):
+	serial(opts.get<string>(string(), "ttyUSB0")),
 	debug(1),
 	state_file("arducontrol.state"),
 	power(false),
@@ -357,9 +357,7 @@ void ArduControl::tick()
 
 			Accessory &acc = i->second;
 			if(tag.command==Accessory::ACTIVATE)
-			{
 				off_timeout = Time::now()+acc.active_time;
-			}
 			else if(tag.command==Accessory::DEACTIVATE)
 			{
 				if(acc.state.commit(tag.serial))