sven
/
icsscand
mirror of https://github.com/intrepidcs/icsscand.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to libicsneo v0.2.0

pull/7/head
Paul Hollinsky 2020-08-06 17:02:12 -04:00
parent 8d21b98ac6
commit 028538cc90
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@ -223,9 +223,8 @@ void searchForDevices() {
}); });
if(!newDevice.device->open() || !newDevice.device->goOnline()) { if(!newDevice.device->open() || !newDevice.device->goOnline()) {
if(firstTimeFailedToOpen) { if(firstTimeFailedToOpen) {
icsneo::APIError err; const std::string err = icsneo::GetLastError().describe();
icsneo::GetLastError(err); LOGF(LOG_INFO, "%s failed to connect. Will keep trying...\n%s\n", newDevice.device->describe().c_str(), err.c_str());
LOGF(LOG_INFO, "%s failed to connect. Will keep trying...\n%s\n", newDevice.device->describe().c_str(), err.describe().c_str());
failedToOpen.push_back(serial); failedToOpen.push_back(serial);
} }
continue; continue;
@ -321,7 +320,7 @@ void searchForDevices() {
openDevices.end() openDevices.end()
); );
for(const auto& err : icsneo::GetErrors()) { for(const auto& err : icsneo::GetEvents()) {
bool forErrorDevice = false; bool forErrorDevice = false;
for(const auto& dev : failedToOpen) { for(const auto& dev : failedToOpen) {
if(err.isForDevice(dev)) { if(err.isForDevice(dev)) {

2
third-party/libicsneo vendored

@ -1 +1 @@
Subproject commit 2a47b6f179699f67dc8c39634ea245c49b02ec0f Subproject commit b09f85693fef5e5513f099648cdf165ade5d20f2