X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcentralstation.cpp;h=dd0cbcf58ef13709cd25989324090cd19a0cf5db;hb=b14059de03324aecde3efc649293d98ce5b7aaf2;hp=6a8de96694f3d9ada60020ff06dc4a018a676de6;hpb=45abb4c64c714cb655988a855158a22976f5e35f;p=r2c2.git

diff --git a/source/libr2c2/centralstation.cpp b/source/libr2c2/centralstation.cpp
index 6a8de96..dd0cbcf 100644
--- a/source/libr2c2/centralstation.cpp
+++ b/source/libr2c2/centralstation.cpp
@@ -250,15 +250,6 @@ bool CentralStation::get_sensor(unsigned addr) const
 
 void CentralStation::tick()
 {
-	Time::TimeStamp t = Time::now();
-	for(SensorMap::iterator i=sensors.begin(); i!=sensors.end(); ++i)
-		if(i->second.off_timeout && t>i->second.off_timeout)
-		{
-			i->second.state = false;
-			i->second.off_timeout = Time::TimeStamp();
-			signal_sensor.emit(i->first, i->second.state);
-		}
-
 	while(Message msg = receive())
 	{
 		if(msg.footer.code)
@@ -599,17 +590,11 @@ void CentralStation::process_object(unsigned id, const Message::AttribMap &attri
 					unsigned addr = base*16+j+1;
 					Sensor &sensor = sensors[addr];
 					bool s = state&(1<<j);
-					if(s)
+					if(s!=sensor.state)
 					{
-						sensor.off_timeout = Time::TimeStamp();
-						if(!sensor.state)
-						{
-							sensor.state = true;
-							signal_sensor.emit(addr, sensor.state);
-						}
+						sensor.state = s;
+						signal_sensor.emit(addr, sensor.state);
 					}
-					else if(sensor.state)
-						sensor.off_timeout = Time::now()+700*Time::msec;
 				}
 			}
 		}