Implement flush() for ArduControl

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

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index ecac7b81e69fb14b6faa435d9c3753f538d7053b..1bb48d47f88eac60a301fc32720abccf33c83809 100644 (file)
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -20,9 +20,10 @@ ArduControl::ProtocolInfo ArduControl::protocol_info[2] =
 
 ArduControl::ArduControl(const Options &opts):
        serial(opts.get<string>(string(), "ttyUSB0")),
-       debug(1),
+       debug(opts.get<unsigned>("debug")),
        state_file("arducontrol.state"),
        power(false),
+       halted(false),
        active_accessory(0),
        s88(*this),
        mfx_search(*this),
@@ -67,8 +68,19 @@ void ArduControl::set_power(bool p)
        }
 }
 
-void ArduControl::halt(bool)
+void ArduControl::halt(bool h)
 {
+       if(h==halted)
+               return;
+
+       halted = h;
+       if(halted)
+       {
+               for(LocomotiveMap::const_iterator i=locomotives.begin(); i!=locomotives.end(); ++i)
+                       set_loco_speed(i->first, 0);
+       }
+
+       signal_halt.emit(halted);
 }
 
 const char *ArduControl::enumerate_protocols(unsigned i) const
@@ -146,6 +158,9 @@ void ArduControl::set_loco_speed(unsigned id, unsigned speed)
        if(speed>protocol_info[loco.proto].max_speed)
                throw invalid_argument("ArduControl::set_loco_speed");
 
+       if(speed && halted)
+               return;
+
        if(loco.speed.set(speed))
        {
                PendingCommand cmd(loco, Locomotive::SPEED);
@@ -389,7 +404,7 @@ void ArduControl::tick()
                }
        }
 
-       while(!active_accessory && !accessory_queue.empty())
+       while(power && !active_accessory && !accessory_queue.empty())
        {
                Accessory &acc = *accessory_queue.front();
 
@@ -401,9 +416,12 @@ void ArduControl::tick()
                        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();
                }
                else
                        accessory_queue.pop_front();
@@ -414,8 +432,23 @@ void ArduControl::tick()
                Time::TimeStamp t = Time::now();
                if(t>off_timeout)
                {
+                       Accessory &acc = *active_accessory;
+
+                       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;
+                               }
+                       }
+
                        off_timeout = Time::TimeStamp();
-                       PendingCommand cmd(*active_accessory, Accessory::DEACTIVATE);
+                       PendingCommand cmd(acc, Accessory::DEACTIVATE, active_index);
                        command_queue.push(cmd);
                }
        }
@@ -423,6 +456,8 @@ void ArduControl::tick()
 
 void ArduControl::flush()
 {
+       while(!command_queue.empty() || !accessory_queue.empty())
+               tick();
 }
 
 void ArduControl::save_state() const
@@ -525,6 +560,8 @@ ArduControl::Accessory::Accessory(Kind k, unsigned a, unsigned b):
        address(a),
        bits(b),
        state(0),
+       uncertain((1<<bits)-1),
+       target(0),
        active_time(500*Time::msec)
 { }
 
@@ -622,6 +659,12 @@ bool ArduControl::Queue<T>::pop(T &item)
        return true;
 }
 
+template<typename T>
+bool ArduControl::Queue<T>::empty() const
+{
+       return items.empty();
+}
+
 
 ArduControl::RefreshTask::RefreshTask():
        next(cycle.end()),
@@ -905,10 +948,58 @@ bool ArduControl::MfxSearchTask::pop_info(MfxInfo &info)
 }
 
 
+ArduControl::MonitorTask::MonitorTask():
+       voltage(0),
+       current(0),
+       base_level(0),
+       peak_level(0),
+       next_type(0)
+{ }
+
+bool ArduControl::MonitorTask::get_work(PendingCommand &cmd)
+{
+       Time::TimeStamp t = Time::now();
+       if(t<next_poll)
+               return false;
+
+       if(next_type==0)
+               cmd.command[0] = READ_INPUT_VOLTAGE;
+       else
+               cmd.command[0] = READ_TRACK_CURRENT;
+       cmd.length = 1;
+
+       next_poll = t+200*Time::msec;
+       next_type = (next_type+1)%5;
+
+       return true;
+}
+
+void ArduControl::MonitorTask::process_reply(const char *reply, unsigned length)
+{
+       unsigned char type = reply[0];
+       if(type==INPUT_VOLTAGE && length==3)
+               voltage = ((static_cast<unsigned char>(reply[1])<<8) | static_cast<unsigned char>(reply[2]))/1000.0f;
+       else if(type==TRACK_CURRENT && length==5)
+       {
+               current = ((static_cast<unsigned char>(reply[1])<<8) | static_cast<unsigned char>(reply[2]))/1000.0f;
+               float peak = ((static_cast<unsigned char>(reply[3])<<8) | static_cast<unsigned char>(reply[4]))/1000.0f;
+               peak_level = max(peak_level, peak);
+               base_level = min(base_level, current);
+       }
+}
+
+void ArduControl::MonitorTask::reset_peak()
+{
+       base_level = current;
+       peak_level = current;
+}
+
+
 ArduControl::ControlThread::ControlThread(ArduControl &c):
        control(c),
        done(false)
 {
+       tasks.push_back(&control.monitor);
        tasks.push_back(&control.mfx_announce);
        tasks.push_back(&control.mfx_search);
        tasks.push_back(&control.s88);
@@ -967,6 +1058,8 @@ void ArduControl::ControlThread::init_baud_rate()
 
        if(!rate)
        {
+               if(control.debug>=1)
+                       IO::print("ArduControl detection failed\n");
                done = true;
                return;
        }