Use beam gates for positioning vehicles

[r2c2.git] / source / libr2c2 / sensor.cpp

diff --git a/source/libr2c2/sensor.cpp b/source/libr2c2/sensor.cpp
index 8a65d3dedf20f52419d130bfd1612f5bb3cc2a30..c31c795f12986e32fbd4f23e95c885e03d1aff2f 100644 (file)
--- a/source/libr2c2/sensor.cpp
+++ b/source/libr2c2/sensor.cpp
@@ -9,6 +9,7 @@ namespace R2C2 {
 Sensor::Sensor(Layout &l):
        layout(l),
        address(0),
+       invert(false),
        state(INACTIVE)
 {
        if(layout.has_driver())
@@ -22,6 +23,13 @@ Sensor::~Sensor()
        layout.remove(*this);
 }
 
+void Sensor::set_address(unsigned a)
+{
+       address = a;
+       if(layout.has_driver())
+               layout.get_driver().add_sensor(address);
+}
+
 void Sensor::tick(const Time::TimeDelta &dt)
 {
        if(state_confirm_timeout)
@@ -43,13 +51,13 @@ void Sensor::event(unsigned a, bool s)
 {
        if(a==address)
        {
-               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;