Avoid negative values of wait_time

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

diff --git a/source/libr2c2/sensor.cpp b/source/libr2c2/sensor.cpp
index 618a06b7b609c6ac8a930bc62c197bb4ac2db768..83dcb6d1be3b6bae9610101672bf21973674e655 100644 (file)
--- 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,6 +10,7 @@ namespace R2C2 {
 Sensor::Sensor(Layout &l):
        layout(l),
        address(0),
+       id(0),
        invert(false),
        state(INACTIVE)
 {
@@ -28,33 +30,34 @@ Sensor::~Sensor()
 void Sensor::set_address(unsigned a)
 {
        Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
-       if(driver && address)
-               driver->remove_sensor(address);
+       if(driver && id)
+               driver->remove_sensor(id);
        address = a;
        if(driver && address)
-               driver->add_sensor(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!=invert && state<MAYBE_ACTIVE)
                {