debug(opts.get<unsigned>("debug")),
state_file("arducontrol.state"),
power(false),
+ halted(false),
active_accessory(0),
+ command_timeout(200*Time::msec),
s88(*this),
mfx_search(*this),
thread(*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);
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);
{
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;
}
}
}
- while(!active_accessory && !accessory_queue.empty())
+ while(power && !active_accessory && !accessory_queue.empty())
{
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) ;
- acc.state.set(acc.state^lowest_bit);
- PendingCommand cmd(acc, Accessory::ACTIVATE, i);
- command_queue.push(cmd);
+ 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)
Time::TimeStamp t = Time::now();
if(t>off_timeout)
{
+ Accessory &acc = *active_accessory;
+
+ 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)
+ {
+ 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);
}
}
void ArduControl::flush()
{
+ while(!command_queue.empty() || (power && !accessory_queue.empty()))
+ tick();
}
void ArduControl::save_state() const
address(a),
bits(b),
state(0),
+ uncertain((1<<bits)-1),
+ target(0),
active_time(500*Time::msec)
{ }
return true;
}
+template<typename T>
+bool ArduControl::Queue<T>::empty() const
+{
+ return items.empty();
+}
+
ArduControl::RefreshTask::RefreshTask():
next(cycle.end()),
}
+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);
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);
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]);
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)
{
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;
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)
{
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
{
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)