Add helper class for processing driver options

[r2c2.git] / source / libr2c2 / arducontrol.cpp

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index dd4e0574eb7d52c4714e8740db3e99c20be40ed8..ecac7b81e69fb14b6faa435d9c3753f538d7053b 100644 (file)
--- 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))