sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Paul Hollinsky
2019-08-12 11:17:28 -04:00
parent ef16e60025 781b23c0e7
commit 0607986114
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/device.cpp
+2 -2
View File
@@ -229,7 +229,7 @@ bool Device::goOnline() {
filter.includeInternalInAny = true; filter.includeInternalInAny = true;
// wait until communication is enabled or 10 seconds, whichever comes first // wait until communication is enabled or 10 seconds, whichever comes first
while((std::chrono::system_clock::now() - startTime) < std::chrono::seconds::duration(5)) { while((std::chrono::system_clock::now() - startTime) < std::chrono::seconds(5)) {
if(latestResetStatus && latestResetStatus->comEnabled) if(latestResetStatus && latestResetStatus->comEnabled)
break; break;
@@ -258,7 +258,7 @@ bool Device::goOffline() {
filter.includeInternalInAny = true; filter.includeInternalInAny = true;
// wait until communication is disabled or 10 seconds, whichever comes first // wait until communication is disabled or 10 seconds, whichever comes first
while((std::chrono::system_clock::now() - startTime) < std::chrono::seconds::duration(5)) { while((std::chrono::system_clock::now() - startTime) < std::chrono::seconds(5)) {
if(latestResetStatus && !latestResetStatus->comEnabled) if(latestResetStatus && !latestResetStatus->comEnabled)
break; break;