Improve accessory switching logic

The off command can be sent as soon as the current monitor indicates that
the solenoid is no longer drawing power.  This allows giving multi-bit
accessories more time to accommodate quirks of the 74465 decoder.

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index 8e28ea66c9ce275142c0dbb9f59f42001e0acfd5..6d75c7542dd0490fb3cde74b8b2e771560636eb1 100644 (file)
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -459,8 +459,9 @@ void ArduControl::tick()
 
        if(active_accessory && off_timeout)
        {
+               bool success = (monitor.get_peak()>0.35f && monitor.get_current()<monitor.get_peak()-0.2f);
                Time::TimeStamp t = Time::now();
-               if(t>off_timeout)
+               if(t>off_timeout || success)
                {
                        Accessory &acc = *active_accessory;
 
@@ -469,7 +470,7 @@ void ArduControl::tick()
                        // 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)
+                       else if(acc.kind==Accessory::TURNOUT && !success)
                        {
                                if(debug>=1)
                                        IO::print("Peak current only %.2f A\n", monitor.get_peak());
@@ -597,7 +598,7 @@ ArduControl::Accessory::Accessory(Kind k, unsigned a, unsigned b, unsigned s):
        state(0),
        uncertain((1<<bits)-1),
        target(0),
-       active_time(500*Time::msec)
+       active_time((bits*700)*Time::msec)
 { }
 
 unsigned ArduControl::Accessory::create_state_command(unsigned b, bool c, char *buffer) const