Add debug output for accessory switching in ArduControl

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

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index 86b3666b2ff13a478ed8a391fe3c2d916b04188d..8e28ea66c9ce275142c0dbb9f59f42001e0acfd5 100644 (file)
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -207,7 +207,7 @@ unsigned ArduControl::add_turnout(unsigned addr, const TrackType &type)
        if(!addr || !type.is_turnout())
                throw invalid_argument("ArduControl::add_turnout");
 
-       return add_accessory(Accessory::TURNOUT, addr, type.get_state_bits());
+       return add_accessory(Accessory::TURNOUT, addr, type.get_state_bits(), type.get_paths());
 }
 
 void ArduControl::remove_turnout(unsigned addr)
@@ -227,7 +227,7 @@ unsigned ArduControl::get_turnout(unsigned addr) const
 
 unsigned ArduControl::add_signal(unsigned addr, const SignalType &)
 {
-       return add_accessory(Accessory::SIGNAL, addr, 1);
+       return add_accessory(Accessory::SIGNAL, addr, 1, 3);
 }
 
 void ArduControl::remove_signal(unsigned addr)
@@ -245,7 +245,7 @@ unsigned ArduControl::get_signal(unsigned addr) const
        return get_accessory(Accessory::SIGNAL, addr);
 }
 
-unsigned ArduControl::add_accessory(Accessory::Kind kind, unsigned addr, unsigned bits)
+unsigned ArduControl::add_accessory(Accessory::Kind kind, unsigned addr, unsigned bits, unsigned states)
 {
        AccessoryMap::iterator i = accessories.lower_bound(addr);
        AccessoryMap::iterator j = accessories.upper_bound(addr+bits-1);
@@ -258,7 +258,7 @@ unsigned ArduControl::add_accessory(Accessory::Kind kind, unsigned addr, unsigne
                        throw key_error(addr);
        }
 
-       insert_unique(accessories, addr, Accessory(kind, addr, bits));
+       insert_unique(accessories, addr, Accessory(kind, addr, bits, states));
        return addr;
 }
 
@@ -276,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);
@@ -291,6 +291,20 @@ unsigned ArduControl::get_accessory(Accessory::Kind kind, unsigned addr) const
        return acc.state;
 }
 
+void ArduControl::activate_accessory_by_mask(Accessory &acc, unsigned mask)
+{
+       unsigned bit = mask&~(mask-1);
+       for(active_index=0; (bit>>active_index)>1; ++active_index) ;
+       acc.state.set((acc.state&~bit)|(acc.target&bit));
+       if(debug>=1)
+               IO::print("Setting accessory %d bit %d, state=%d\n", acc.address, active_index, acc.state.pending);
+       PendingCommand cmd(acc, Accessory::ACTIVATE, active_index);
+       command_queue.push(cmd);
+       active_accessory = &acc;
+
+       monitor.reset_peak();
+}
+
 unsigned ArduControl::add_sensor(unsigned addr)
 {
        if(!addr)
@@ -378,13 +392,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;
                                }
@@ -409,23 +416,45 @@ void ArduControl::tick()
        {
                Accessory &acc = *accessory_queue.front();
 
-               if(acc.state!=acc.target)
+               if(acc.uncertain)
+               {
+                       unsigned zeroes = acc.uncertain&~acc.target;
+                       if(zeroes)
+                               activate_accessory_by_mask(acc, zeroes);
+                       else
+                               activate_accessory_by_mask(acc, acc.uncertain);
+               }
+               else if(acc.state!=acc.target)
                {
-                       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);
+                       if(!(changes&((1<<acc.bits)-1)))
+                       {
+                               // All remaining changes are in non-physical bits
+                               acc.state.set(acc.state^changes);
+                               acc.state.commit(acc.state.serial);
+                       }
+                       else
+                       {
+                               unsigned toggle_bit = 0;
+                               for(unsigned bit=1; (!toggle_bit && bit<=changes); bit<<=1)
+                                       if((changes&bit) && (acc.valid_states&(1<<(acc.state^bit))))
+                                               toggle_bit = bit;
 
-                       monitor.reset_peak();
+                               activate_accessory_by_mask(acc, toggle_bit);
+                       }
                }
                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)
@@ -435,17 +464,21 @@ 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();
+                               if(debug>=1)
+                                       IO::print("Peak current only %.2f A\n", monitor.get_peak());
+                               signal_turnout_failed.emit(acc.address);
+                               acc.state.rollback();
+                               if(acc.valid_states&(1<<(acc.target^bit)))
                                        acc.target ^= bit;
-                               }
+                               else
+                                       acc.target = acc.state;
                        }
 
                        off_timeout = Time::TimeStamp();
@@ -457,7 +490,7 @@ void ArduControl::tick()
 
 void ArduControl::flush()
 {
-       while(!command_queue.empty() || !accessory_queue.empty())
+       while(!command_queue.empty() || (power && !accessory_queue.empty()))
                tick();
 }
 
@@ -556,10 +589,11 @@ unsigned ArduControl::Locomotive::create_speed_func_command(unsigned f, char *bu
 }
 
 
-ArduControl::Accessory::Accessory(Kind k, unsigned a, unsigned b):
+ArduControl::Accessory::Accessory(Kind k, unsigned a, unsigned b, unsigned s):
        kind(k),
        address(a),
        bits(b),
+       valid_states(s),
        state(0),
        uncertain((1<<bits)-1),
        target(0),
@@ -1205,14 +1239,11 @@ unsigned ArduControl::ControlThread::process_reply(const char *reply, unsigned r
                return type;
        }
        else if(type==POWER_STATE && rlength==2)
+               set_power(reply[1]);
+       else if(type==OVERCURRENT)
        {
-               control.power.set(reply[1]);
-
-               Tag tag;
-               tag.type = Tag::GENERAL;
-               tag.command = POWER;
-               tag.serial = control.power.serial;
-               control.completed_commands.push(tag);
+               set_power(false);
+               IO::print("Overcurrent detected!\n");
        }
        else
        {
@@ -1223,6 +1254,17 @@ unsigned ArduControl::ControlThread::process_reply(const char *reply, unsigned r
        return 0;
 }
 
+void ArduControl::ControlThread::set_power(bool p)
+{
+       control.power.set(p);
+
+       Tag tag;
+       tag.type = Tag::GENERAL;
+       tag.command = POWER;
+       tag.serial = control.power.serial;
+       control.completed_commands.push(tag);
+}
+
 
 ArduControl::Loader::Loader(ArduControl &c):
        DataFile::ObjectLoader<ArduControl>(c)