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

Check serial number on device open, get correctly for PCAP devices

Browse Source
This commit is contained in:
Paul Hollinsky
2018-09-25 17:53:58 -04:00
parent 72773d9afa
commit 69773d6537
7 changed files with 97 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/device.cpp
+29 -2
View File
@@ -123,10 +123,37 @@ bool Device::open() {
if(!com)
return false;
if(!com->open())
return false;
auto serial = com->getSerialNumberSync();
int i = 0;
while(!serial) {
serial = com->getSerialNumberSync();
if(i++ > 5)
break;
}
if(!serial) {
std::cout << "Failed to get serial number in " << i << " tries" << std::endl;
return false;
}
if(i != 0)
std::cout << "Took " << i << " tries to get the serial number" << std::endl;
std::string currentSerial = getNeoDevice().serial;
if(currentSerial == SERIAL_FIND_ON_OPEN) {
strncpy(getWritableNeoDevice().serial, serial->deviceSerial.c_str(), sizeof(getNeoDevice().serial));
getWritableNeoDevice().serial[sizeof(getWritableNeoDevice().serial) - 1] = '\0';
} else if(currentSerial != serial->deviceSerial) {
std::cout << "NeoDevice has serial " << getNeoDevice().serial << " but device has serial " << serial->deviceSerial.c_str() << "!" << std::endl;
return false;
}
if(settings)
settings->refresh();
return com->open();
return true;
}
bool Device::close() {
@@ -141,7 +168,7 @@ bool Device::close() {
bool Device::goOnline() {
if(!com->sendCommand(Command::EnableNetworkCommunication, true))
return false;
online = true;
return true;
}