debug(opts.get<unsigned>("debug")),
state_file("arducontrol.state"),
power(false),
+ halted(false),
active_accessory(0),
s88(*this),
mfx_search(*this),
}
}
-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
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);
}
}
- while(!active_accessory && !accessory_queue.empty())
+ while(power && !active_accessory && !accessory_queue.empty())
{
Accessory &acc = *accessory_queue.front();
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();
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, active_index);
+ PendingCommand cmd(acc, Accessory::DEACTIVATE, active_index);
command_queue.push(cmd);
}
}
address(a),
bits(b),
state(0),
+ uncertain((1<<bits)-1),
+ target(0),
active_time(500*Time::msec)
{ }