X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fsensor.h;h=d3db6367a2b7b40ed9d0a232906c2f23561b4513;hb=52cbe8d99669f843f8f75c51128e2748584dd03a;hp=e5e1b43eea2dde6be8ebb2e295c7e71ad00c889f;hpb=36beacc579d3132642ed4d98ce5a6d99842b5812;p=r2c2.git

diff --git a/source/libmarklin/sensor.h b/source/libmarklin/sensor.h
index e5e1b43..d3db636 100644
--- a/source/libmarklin/sensor.h
+++ b/source/libmarklin/sensor.h
@@ -3,7 +3,8 @@
 
 #include <list>
 #include <map>
-#include <sigc++/sigc++.h>
+#include <sigc++/signal.h>
+#include <msp/time/timestamp.h>
 
 namespace Marklin {
 
@@ -17,15 +18,15 @@ public:
 	Sensor(Control &, unsigned);
 	unsigned get_address() const { return addr; }
 	bool     get_state() const   { return state; }
+	void     tick();
 private:
 	Control  &control;
 	unsigned addr;
 	bool     state;
+	Msp::Time::TimeStamp off_timeout;
 
 	void sensor_event(unsigned, bool);
 };
-typedef std::list<Sensor *> SensorSeq;
-typedef std::map<unsigned, Sensor *> SensorMap;
 
 } // namespace Marklin