X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsensor.cpp;h=ecd06473fb4bdf2234a2c149f19d0b3ae1af849e;hb=73e4a36bbf828e07b83a779b696875e1f80045cc;hp=1b7e8cc10c08881a49a22743684046b64683a9fe;hpb=59bae8acd679127602cf35d22bcd37e316a5a056;p=r2c2.git

diff --git a/source/libr2c2/sensor.cpp b/source/libr2c2/sensor.cpp
index 1b7e8cc..ecd0647 100644
--- a/source/libr2c2/sensor.cpp
+++ b/source/libr2c2/sensor.cpp
@@ -9,17 +9,33 @@ namespace R2C2 {
 Sensor::Sensor(Layout &l):
 	layout(l),
 	address(0),
+	id(0),
+	invert(false),
 	state(INACTIVE)
 {
 	if(layout.has_driver())
 		layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Sensor::event));
 
-	layout.add_sensor(*this);
+	layout.add(*this);
 }
 
 Sensor::~Sensor()
 {
-	layout.remove_sensor(*this);
+	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)
@@ -39,17 +55,17 @@ void Sensor::tick(const Time::TimeDelta &dt)
 	}
 }
 
-void Sensor::event(unsigned a, bool s)
+void Sensor::event(unsigned i, bool s)
 {
-	if(a==address)
+	if(i==id)
 	{
-		if(s && state<MAYBE_ACTIVE)
+		if(s!=invert && state<MAYBE_ACTIVE)
 		{
 			state = MAYBE_ACTIVE;
 			state_confirm_timeout = 300*Time::msec;
 			signal_state_changed.emit(state);
 		}
-		else if(!s && state>MAYBE_INACTIVE)
+		else if(s==invert && state>MAYBE_INACTIVE)
 		{
 			state = MAYBE_INACTIVE;
 			state_confirm_timeout = 700*Time::msec;