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)
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)
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);
throw key_error(addr);
}
- insert_unique(accessories, addr, Accessory(kind, addr, bits));
+ insert_unique(accessories, addr, Accessory(kind, addr, bits, states));
return addr;
}
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);
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)
{
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;
}
{
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)
{
+ 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;
- 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 && !success)
{
- 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();
void ArduControl::flush()
{
- while(!command_queue.empty() || !accessory_queue.empty())
+ while(!command_queue.empty() || (power && !accessory_queue.empty()))
tick();
}
}
-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),
- active_time(500*Time::msec)
+ active_time((bits*700)*Time::msec)
{ }
unsigned ArduControl::Accessory::create_state_command(unsigned b, bool c, char *buffer) const
}
+bool ArduControl::CommandQueueTask::get_work(PendingCommand &cmd)
+{
+ return queue.pop(cmd);
+}
+
+void ArduControl::CommandQueueTask::push(const PendingCommand &cmd)
+{
+ queue.push(cmd);
+}
+
+
ArduControl::RefreshTask::RefreshTask():
next(cycle.end()),
round(0),
control(c),
done(false)
{
+ tasks.push_back(&control.command_queue);
tasks.push_back(&control.monitor);
tasks.push_back(&control.mfx_announce);
tasks.push_back(&control.mfx_search);
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);
bool ArduControl::ControlThread::get_work(PendingCommand &cmd)
{
- if(control.command_queue.pop(cmd))
- return true;
-
for(vector<Task *>::iterator i=tasks.begin(); i!=tasks.end(); ++i)
if((*i)->get_work(cmd))
return true;
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)
projects / r2c2.git / blobdiff