official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

consolidate status changes

This commit is contained in:
Kevin Matz 2022-11-28 11:22:06 -05:00
parent 73ee83cd9e
commit 71edfaf7e9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocol/dmx/universe.cpp
View File

@ -128,8 +128,6 @@ void Universe::setData(const std::vector<uint8_t>& data)
rx_timeout_(true);
// notify callbacks
setStatus(Status::DMX_ACTIVE);
last_seen_ = std::chrono::system_clock::now();
doDataCallbacks();
}
@ -271,9 +269,13 @@ void Universe::rx_timeout_(bool add_now)
auto age = rxAge();
if (add_now)
{
setStatus(Status::DMX_ACTIVE);
last_seen_ = now;
rx_times_.push(now);
}
else if (age >= E111_DATA_LOSS_TIMEOUT)
// E1.11 DMX timeout period may be different the the rx_timeout_period
setStatus(Status::DMX_LOST);
auto elapsed = [] (auto& a, auto& b) {
return std::chrono::duration_cast<std::chrono::milliseconds>(a - b).count();
@ -286,8 +288,6 @@ void Universe::rx_timeout_(bool add_now)
break;
else
rx_times_.pop();
if (age >= E111_DATA_LOSS_TIMEOUT)
setStatus(Status::DMX_LOST);
}
}