Timer: fix atomic add
This commit is contained in:
parent
e899ba9cc9
commit
940b978764
@ -177,20 +177,14 @@ StateHandler::stateSensors (const Event &event)
|
|||||||
sensors_data[TEMPERATURE] = humidity.readT ();
|
sensors_data[TEMPERATURE] = humidity.readT ();
|
||||||
sensors_data[PRESSUREDAT] = pressure->getPressure ();
|
sensors_data[PRESSUREDAT] = pressure->getPressure ();
|
||||||
sensors_data[CO2] = co2.read ();
|
sensors_data[CO2] = co2.read ();
|
||||||
state_timer->Sleep(10);
|
state_timer->tickCounter(5);
|
||||||
sensors_data[HUMIDITY] = humidity.readRH ();
|
sensors_data[HUMIDITY] = humidity.readRH ();
|
||||||
// displaySens ();
|
|
||||||
break;
|
break;
|
||||||
case Event::eExit:
|
case Event::eExit:
|
||||||
break;
|
break;
|
||||||
case Event::eKey:
|
case Event::eKey:
|
||||||
handleControlButtons (event.value);
|
|
||||||
break;
|
break;
|
||||||
case Event::eTick:
|
case Event::eTick:
|
||||||
// save (pressure->getPressure (), ((current_mode) ? AUTO :
|
|
||||||
// MANUAL));
|
|
||||||
SetState (current_mode ? &StateHandler::stateAuto
|
|
||||||
: &StateHandler::stateManual);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,9 +47,9 @@ Timer::tickCounter (int ms)
|
|||||||
{
|
{
|
||||||
if (counter >= INT_MAX)
|
if (counter >= INT_MAX)
|
||||||
{
|
{
|
||||||
counter = 0;
|
resetCounter();
|
||||||
}
|
}
|
||||||
counter++;
|
counter.fetch_add(ms, std::memory_order_relaxed);
|
||||||
Sleep (ms);
|
Sleep (ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user