BasicLoader is now called ObjectLoader

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

diff --git a/source/libr2c2/intellibox.cpp b/source/libr2c2/intellibox.cpp
index 7702ed6b1bdde49b9309c2da9ef72f54fd3e2ae6..82623e1760891a4b4e0e9d55a3094eddb5bc1f5e 100644 (file)
--- a/source/libr2c2/intellibox.cpp
+++ b/source/libr2c2/intellibox.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <fcntl.h>
 #include <termios.h>
 #include <sys/poll.h>
@@ -21,54 +14,38 @@ using namespace Msp;
 namespace R2C2 {
 
 Intellibox::Intellibox(const string &dev):
+       serial(dev),
        power(false),
        halted(false),
        update_sensors(false),
        command_sent(false)
 {
-       serial_fd = ::open(dev.c_str(), O_RDWR);
-       if(serial_fd<0)
-               throw Exception("Couldn't open serial port\n");
+       static unsigned baud[]= { 2400, 4800, 9600, 19200, 0 };
 
-       static unsigned baud[]=
-       {
-                2400, B2400,
-                4800, B4800,
-                9600, B9600,
-               19200, B19200,
-               0
-       };
-
-       termios attr;
-       tcgetattr(serial_fd, &attr);
-       cfmakeraw(&attr);
-       attr.c_cflag |= CSTOPB;
+       serial.set_stop_bits(2);
 
        bool ok = false;
        bool p50 = false;
-       for(unsigned i=0; baud[i]; i+=2)
+       for(unsigned i=0; baud[i]; ++i)
        {
-               cfsetospeed(&attr, baud[i+1]);
-               tcsetattr(serial_fd, TCSADRAIN, &attr);
-
-               write(serial_fd, "\xC4", 1);
+               serial.set_baud_rate(baud[i]);
+               serial.put('\xC4');
 
-               pollfd pfd = { serial_fd, POLLIN, 0 };
-               if(poll(&pfd, 1, 500)>0)
+               if(IO::poll(serial, IO::P_INPUT, 500*Time::msec))
                {
                        IO::print("IB detected at %d bits/s\n", baud[i]);
                        char buf[2];
-                       p50 = (read(serial_fd, buf, 2)==2);
+                       p50 = (serial.read(buf, 2)==2);
                        ok = true;
                        break;
                }
        }
 
        if(!ok)
-               throw Exception("IB not detected");
+               throw runtime_error("IB not detected");
 
        if(p50)
-               write(serial_fd, "xZzA1\r", 6);
+               serial.write("xZzA1\r", 6);
 
        command(CMD_STATUS);
 }
@@ -242,7 +219,7 @@ void Intellibox::set_turnout(unsigned addr, unsigned state)
 {
        Turnout &turnout = turnouts[addr];
        unsigned mask = (1<<turnout.bits)-1;
-       if(((state^turnout.state)&mask)==0 || ((state^turnout.pending)&mask)==0)
+       if(((state^turnout.state)&mask)==0 || ((state^turnout.pending)&mask)==0 || !turnout.synced)
        {
                turnout.state = state;
                turnout.pending = state;
@@ -334,8 +311,7 @@ void Intellibox::tick()
 
        if(!queue.empty() && command_sent)
        {
-               pollfd pfd = { serial_fd, POLLIN, 0 };
-               if(poll(&pfd, 1, 0)>0)
+               if(IO::poll(serial, IO::P_INPUT, Time::zero))
                {
                        process_reply(t);
                        queue.erase(queue.begin());
@@ -348,23 +324,21 @@ void Intellibox::tick()
        if(!queue.empty())
        {
                const CommandSlot &slot = queue.front();
-               write(serial_fd, slot.data, slot.length);
+               serial.write(reinterpret_cast<const char *>(slot.data), slot.length);
                command_sent = true;
        }
 }
 
 void Intellibox::flush()
 {
-       Time::TimeStamp t = Time::now();
        for(list<CommandSlot>::iterator i=queue.begin(); i!=queue.end(); ++i)
        {
-               write(serial_fd, i->data, i->length);
-               pollfd pfd = { serial_fd, POLLIN, 0 };
+               serial.write(reinterpret_cast<const char *>(i->data), i->length);
                bool first = true;
-               while(poll(&pfd, 1, (first ? -1 : 0))>0)
+               while(first ? IO::poll(serial, IO::P_INPUT) : IO::poll(serial, IO::P_INPUT, Time::zero))
                {
                        char data[16];
-                       read(serial_fd, data, 16);
+                       serial.read(data, 16);
                        first = false;
                }
        }
@@ -380,7 +354,7 @@ Intellibox::Protocol Intellibox::map_protocol(const string &name) const
        else if(name=="MM-27")
                return MM_27;
        else
-               throw InvalidParameterValue("Unknown protocol");
+               throw invalid_argument("Intellibox::map_protocol");
 }
 
 void Intellibox::command(Command cmd)
@@ -601,6 +575,8 @@ void Intellibox::process_reply(const Time::TimeStamp &t)
                                turnout.pending = turnout.state;
                                signal_turnout.emit(addr, turnout.state);
                        }
+
+                       turnout.synced = true;
                }
                else
                        error(cmd, err);
@@ -620,24 +596,22 @@ void Intellibox::process_reply(const Time::TimeStamp &t)
 
                        unsigned speed = (data[0]<=1 ? 0 : data[0]*2/19+1);
                        bool reverse = !(data[1]&0x20);
-                       if(speed!=loco.speed || reverse!=loco.reverse)
-                       {
-                               loco.speed = speed;
-                               loco.reverse = reverse;
-                               signal_loco_speed.emit(addr, loco.speed, loco.reverse);
-                       }
+                       bool speed_changed = (speed!=loco.speed || reverse!=loco.reverse);
+
+                       loco.speed = speed;
+                       loco.reverse = reverse;
 
                        unsigned funcs = (data[1]&0xF)<<1;
                        if(data[1]&0x10)
                                funcs |= 1;
-                       if(funcs!=loco.funcs)
-                       {
-                               unsigned changed = loco.funcs^funcs;
-                               loco.funcs = funcs;
-                               for(unsigned i=0; i<5; ++i)
-                                       if(changed&(1<<i))
-                                               signal_loco_function.emit(addr, i, loco.funcs&(1<<i));
-                       }
+                       unsigned funcs_changed = loco.funcs^funcs;
+                       loco.funcs = funcs;
+
+                       if(speed_changed)
+                               signal_loco_speed.emit(addr, loco.speed, loco.reverse);
+                       for(unsigned i=0; i<5; ++i)
+                               if(funcs_changed&(1<<i))
+                                       signal_loco_function.emit(addr, i, loco.funcs&(1<<i));
                }
                else
                        error(cmd, err);
@@ -669,7 +643,7 @@ unsigned Intellibox::read_all(unsigned char *buf, unsigned len)
 {
        unsigned pos = 0;
        while(pos<len)
-               pos += read(serial_fd, buf+pos, len-pos);
+               pos += serial.read(reinterpret_cast<char *>(buf+pos), len-pos);
 
        return pos;
 }
@@ -748,7 +722,8 @@ Intellibox::Turnout::Turnout():
        bits(1),
        state(0),
        active(false),
-       pending(false)
+       synced(false),
+       pending(0)
 { }