}
if(!ok)
- throw Exception("IB not detected");
+ throw runtime_error("IB not detected");
if(p50)
serial.write("xZzA1\r", 6);
}
void Intellibox::add_turnout(unsigned addr, const TrackType &type)
+{
+ add_turnout(addr, type.get_state_bits(), false);
+}
+
+void Intellibox::add_turnout(unsigned addr, unsigned bits, bool signal)
{
if(!turnouts.count(addr))
{
Turnout &turnout = turnouts[addr];
- turnout.bits = type.get_state_bits();
+ turnout.bits = bits;
+ turnout.signal = signal;
unsigned char data[2];
data[0] = addr&0xFF;
}
}
+void Intellibox::turnout_state_changed(unsigned addr, const Turnout &turnout) const
+{
+ if(turnout.signal)
+ signal_signal.emit(addr, turnout.state);
+ else
+ signal_turnout.emit(addr, turnout.state);
+}
+
void Intellibox::set_turnout(unsigned addr, unsigned state)
{
Turnout &turnout = turnouts[addr];
{
turnout.state = state;
turnout.pending = state;
- signal_turnout.emit(addr, state);
+ turnout_state_changed(addr, turnout);
return;
}
return 0;
}
+void Intellibox::add_signal(unsigned addr, const SignalType &)
+{
+ add_turnout(addr, 1, true);
+}
+
+void Intellibox::set_signal(unsigned addr, unsigned state)
+{
+ set_turnout(addr, state);
+}
+
+unsigned Intellibox::get_signal(unsigned addr) const
+{
+ return get_turnout(addr);
+}
+
void Intellibox::add_sensor(unsigned addr)
{
if(!sensors.count(addr))
else if(name=="MM-27")
return MM_27;
else
- throw InvalidParameterValue("Unknown protocol");
+ throw invalid_argument("Intellibox::map_protocol");
}
void Intellibox::command(Command cmd)
unsigned bit = !(data[1]&0x80);
turnout.state = (turnout.state&~mask) | (bit*mask);
turnout.pending = turnout.state;
- signal_turnout.emit(addr, turnout.state);
+ turnout_state_changed(addr,turnout);
}
}
else if(cmd==CMD_EVENT_SENSOR)
if(turnout.active)
{
if(turnout.state==turnout.pending)
- signal_turnout.emit(addr, turnout.state);
+ turnout_state_changed(addr, turnout);
turnout.off_timeout = t+500*Time::msec;
}
}
{
turnout.state = (turnout.state&~mask) | (bit*mask);
turnout.pending = turnout.state;
- signal_turnout.emit(addr, turnout.state);
+ turnout_state_changed(addr, turnout);
}
turnout.synced = true;
state(0),
active(false),
synced(false),
- pending(0)
+ pending(0),
+ signal(false)
{ }