Fix handling of uncertain bits in accessories

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

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index 1bb48d47f88eac60a301fc32720abccf33c83809..2cdf0c6798440026782b7ba3b9d2ca245b74db9a 100644 (file)
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -25,6 +25,7 @@ ArduControl::ArduControl(const Options &opts):
        power(false),
        halted(false),
        active_accessory(0),
+       command_timeout(200*Time::msec),
        s88(*this),
        mfx_search(*this),
        thread(*this)
@@ -275,7 +276,7 @@ void ArduControl::set_accessory(Accessory::Kind kind, unsigned addr, unsigned st
        if(acc.kind!=kind)
                throw key_error(addr);
 
-       if(state!=acc.target)
+       if(state!=acc.target || acc.uncertain)
        {
                acc.target = state;
                accessory_queue.push_back(&acc);
@@ -377,13 +378,6 @@ void ArduControl::tick()
                        {
                                if(acc.state.commit(tag.serial))
                                {
-                                       if(acc.state==acc.target)
-                                       {
-                                               if(acc.kind==Accessory::TURNOUT)
-                                                       signal_turnout.emit(acc.address, acc.state);
-                                               else if(acc.kind==Accessory::SIGNAL)
-                                                       signal_signal.emit(acc.address, acc.state);
-                                       }
                                        if(&acc==active_accessory)
                                                active_accessory = 0;
                                }
@@ -408,23 +402,40 @@ void ArduControl::tick()
        {
                Accessory &acc = *accessory_queue.front();
 
-               if(acc.state!=acc.target)
+               if(acc.state!=acc.target || acc.uncertain)
                {
-                       active_accessory = &acc;
-
                        unsigned changes = acc.state^acc.target;
                        unsigned lowest_bit = changes&~(changes-1);
-                       unsigned i;
-                       for(i=0; (lowest_bit>>i)>1; ++i) ;
-                       active_index = i;
-                       acc.state.set(acc.state^lowest_bit);
-                       PendingCommand cmd(acc, Accessory::ACTIVATE, i);
-                       command_queue.push(cmd);
-
-                       monitor.reset_peak();
+                       if(lowest_bit>>acc.bits)
+                       {
+                               // All remaining changes are in non-physical bits
+                               acc.state.set(acc.state^changes);
+                               acc.state.commit(acc.state.serial);
+                       }
+                       else
+                       {
+                               unsigned mask = (lowest_bit ? lowest_bit : acc.uncertain);
+                               for(active_index=0; (mask>>active_index)>1; ++active_index) ;
+                               acc.state.set(acc.state^lowest_bit);
+                               PendingCommand cmd(acc, Accessory::ACTIVATE, active_index);
+                               command_queue.push(cmd);
+                               active_accessory = &acc;
+
+                               monitor.reset_peak();
+                       }
                }
                else
+               {
                        accessory_queue.pop_front();
+
+                       if(acc.state==acc.target)
+                       {
+                               if(acc.kind==Accessory::TURNOUT)
+                                       signal_turnout.emit(acc.address, acc.state);
+                               else if(acc.kind==Accessory::SIGNAL)
+                                       signal_signal.emit(acc.address, acc.state);
+                       }
+               }
        }
 
        if(active_accessory && off_timeout)
@@ -434,17 +445,16 @@ void ArduControl::tick()
                {
                        Accessory &acc = *active_accessory;
 
-                       if(acc.kind==Accessory::TURNOUT && monitor.get_peak()<0.5f)
+                       unsigned bit = 1<<active_index;
+
+                       // Assume success if we were uncertain of the physical setting
+                       if(acc.uncertain&bit)
+                               acc.uncertain &= ~bit;
+                       else if(acc.kind==Accessory::TURNOUT && monitor.get_peak()<0.5f)
                        {
-                               unsigned bit = 1<<active_index;
-                               if(acc.uncertain&bit)
-                                       acc.uncertain &= ~bit;
-                               else
-                               {
-                                       signal_turnout_failed.emit(acc.address);
-                                       acc.state.rollback();
-                                       acc.target ^= bit;
-                               }
+                               signal_turnout_failed.emit(acc.address);
+                               acc.state.rollback();
+                               acc.target ^= bit;
                        }
 
                        off_timeout = Time::TimeStamp();
@@ -456,7 +466,7 @@ void ArduControl::tick()
 
 void ArduControl::flush()
 {
-       while(!command_queue.empty() || !accessory_queue.empty())
+       while(!command_queue.empty() || (power && !accessory_queue.empty()))
                tick();
 }
 
@@ -1024,10 +1034,41 @@ void ArduControl::ControlThread::main()
                if(get_work(cmd))
                {
                        bool success = true;
+                       bool resync = false;
                        for(unsigned i=0; (success && i<cmd.repeat_count); ++i)
-                               success = (do_command(cmd)==COMMAND_OK);
+                       {
+                               unsigned result = do_command(cmd, control.command_timeout);
+                               success = (result==COMMAND_OK);
+                               resync = (result==0);
+                       }
+
                        if(success && cmd.tag)
                                control.completed_commands.push(cmd.tag);
+
+                       if(resync)
+                       {
+                               if(control.debug>=1)
+                                       IO::print("Synchronization with ArduControl lost, attempting to recover\n");
+                               for(unsigned i=0; (resync && i<16); ++i)
+                               {
+                                       control.serial.put('\xFF');
+                                       while(IO::poll(control.serial, IO::P_INPUT, control.command_timeout))
+                                               resync = (control.serial.get()!=0xFF);
+                               }
+                               if(resync)
+                               {
+                                       if(control.debug>=1)
+                                               IO::print("Resynchronization failed, giving up\n");
+                                       done = true;
+                               }
+                               else
+                               {
+                                       if(control.debug>=1)
+                                               IO::print("Resynchronization successful\n");
+                                       if(cmd.tag)
+                                               control.command_queue.push(cmd);
+                               }
+                       }
                }
                else
                        Time::sleep(10*Time::msec);
@@ -1074,11 +1115,11 @@ void ArduControl::ControlThread::init_baud_rate()
                cmd.command[1] = rates[0]>>8;
                cmd.command[2] = rates[0];
                cmd.length = 3;
-               if(do_command(cmd)==COMMAND_OK)
+               if(do_command(cmd, Time::sec)==COMMAND_OK)
                {
                        control.serial.set_baud_rate(rates[0]);
                        Time::sleep(Time::sec);
-                       if(do_command(cmd)==COMMAND_OK)
+                       if(do_command(cmd, Time::sec)==COMMAND_OK)
                        {
                                if(control.debug>=1)
                                        IO::print("Rate changed to %d bits/s\n", rates[0]);
@@ -1106,7 +1147,7 @@ bool ArduControl::ControlThread::get_work(PendingCommand &cmd)
        return true;
 }
 
-unsigned ArduControl::ControlThread::do_command(const PendingCommand &cmd)
+unsigned ArduControl::ControlThread::do_command(const PendingCommand &cmd, const Time::TimeDelta &timeout)
 {
        if(control.debug>=2)
        {
@@ -1126,7 +1167,7 @@ unsigned ArduControl::ControlThread::do_command(const PendingCommand &cmd)
                if(result)
                        got_data = IO::poll(control.serial, IO::P_INPUT, Time::zero);
                else
-                       got_data = IO::poll(control.serial, IO::P_INPUT);
+                       got_data = IO::poll(control.serial, IO::P_INPUT, timeout);
 
                if(!got_data)
                        break;
@@ -1141,7 +1182,11 @@ unsigned ArduControl::ControlThread::do_command(const PendingCommand &cmd)
                char reply[15];
                unsigned pos = 0;
                while(pos<rlength)
+               {
+                       if(!IO::poll(control.serial, IO::P_INPUT, timeout))
+                               return 0;
                        pos += control.serial.read(reply+pos, rlength-pos);
+               }
 
                if(control.debug>=2)
                {