Sensor::Sensor(Layout &l):
layout(l),
address(0),
+ id(0),
invert(false),
state(INACTIVE)
{
Sensor::~Sensor()
{
+ if(layout.has_driver() && address)
+ layout.get_driver().remove_sensor(address);
layout.remove(*this);
}
+void Sensor::set_address(unsigned a)
+{
+ Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
+ if(driver && id)
+ driver->remove_sensor(id);
+ address = a;
+ if(driver && address)
+ id = driver->add_sensor(address);
+ else
+ id = 0;
+}
+
void Sensor::tick(const Time::TimeDelta &dt)
{
if(state_confirm_timeout)
}
}
-void Sensor::event(unsigned a, bool s)
+void Sensor::event(unsigned i, bool s)
{
- if(a==address)
+ if(i==id)
{
if(s!=invert && state<MAYBE_ACTIVE)
{