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

diff --git a/source/libr2c2/sensor.cpp b/source/libr2c2/sensor.cpp
index 1b7e8cc..83dcb6d 100644
--- a/source/libr2c2/sensor.cpp
+++ b/source/libr2c2/sensor.cpp
@@ -2,6 +2,7 @@
 #include "layout.h"
 #include "sensor.h"
 
+using namespace std;
 using namespace Msp;
 
 namespace R2C2 {
@@ -9,47 +10,62 @@ 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)
 {
 	if(state_confirm_timeout)
 	{
-		state_confirm_timeout -= dt;
+		state_confirm_timeout = max(state_confirm_timeout-dt, Time::zero);
 		if(state_confirm_timeout<=Time::zero)
 		{
 			if(state==MAYBE_INACTIVE)
 				state = INACTIVE;
 			else if(state==MAYBE_ACTIVE)
 				state = ACTIVE;
-			state_confirm_timeout = Time::zero;
 			signal_state_changed.emit(state);
 		}
 	}
 }
 
-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;