tanner/logiops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed error that caused logid to stop querying asleep devices

Browse Source
This commit is contained in:
rockerbacon 2019-09-20 18:03:23 -03:00
parent ba0bf93b80
commit 03560b08df
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/logid/DeviceFinder.cpp
View File

@ -9,11 +9,15 @@
#include <thread> #include <thread>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <chrono>
#include "DeviceFinder.h" #include "DeviceFinder.h"
#include "util.h" #include "util.h"
#include "Device.h" #include "Device.h"
#define MAX_CONNECTION_TRIES 10
#define TIME_BETWEEN_CONNECTION_TRIES 1s
void stopAndDeletePairedDevice (PairedDevice &pairedDevice) void stopAndDeletePairedDevice (PairedDevice &pairedDevice)
{ {
log_printf(INFO, "%s (Device %d on %s) disconnected", pairedDevice.device->name.c_str(), pairedDevice.device->index, pairedDevice.device->path.c_str()); log_printf(INFO, "%s (Device %d on %s) disconnected", pairedDevice.device->name.c_str(), pairedDevice.device->index, pairedDevice.device->path.c_str());
@ -86,12 +90,12 @@ void DeviceFinder::stopAndDeleteDevice (const std::string &path, HIDPP::DeviceIn
void DeviceFinder::addDevice(const char *path) void DeviceFinder::addDevice(const char *path)
{ {
using namespace std::chrono_literals;
std::string string_path(path); std::string string_path(path);
// Asynchronously scan device // Asynchronously scan device
std::thread{[=]() std::thread{[=]()
{ {
const int max_tries = 10;
const int try_delay = 250000;
//Check if device is an HID++ device and handle it accordingly //Check if device is an HID++ device and handle it accordingly
try try
@ -107,8 +111,11 @@ void DeviceFinder::addDevice(const char *path)
if(!has_receiver_index && index == HIDPP::WirelessDevice1) if(!has_receiver_index && index == HIDPP::WirelessDevice1)
break; break;
for(int i = 0; i < max_tries; i++)
{ bool device_not_connected = true;
bool device_unknown = false;
int remaining_tries = MAX_CONNECTION_TRIES;
do {
try try
{ {
HIDPP::Device d(&dispatcher, index); HIDPP::Device d(&dispatcher, index);
@ -121,41 +128,44 @@ void DeviceFinder::addDevice(const char *path)
{ {
this->insertNewDevice(string_path, index); this->insertNewDevice(string_path, index);
} }
break; device_not_connected = false;
} }
catch(HIDPP10::Error &e) catch(HIDPP10::Error &e)
{ {
if(e.errorCode() != HIDPP10::Error::UnknownDevice) if(e.errorCode() != HIDPP10::Error::UnknownDevice)
{ {
if(i == max_tries - 1) if(remaining_tries == 1)
log_printf(ERROR, "Error while querying %s, wireless device %d: %s", string_path.c_str(), index, e.what()); {
else usleep(try_delay); log_printf(WARN, "While querying %s, wireless device %d: %s", string_path.c_str(), index, e.what());
remaining_tries += MAX_CONNECTION_TRIES; // asleep wireless devices may raise this error, so warn but do not stop querying device
}
} }
else break; else device_unknown = true;
} }
catch(HIDPP20::Error &e) catch(HIDPP20::Error &e)
{ {
if(e.errorCode() != HIDPP20::Error::UnknownDevice) if(e.errorCode() != HIDPP20::Error::UnknownDevice)
{ {
if(i == max_tries - 1) if(remaining_tries == 1)
log_printf(ERROR, "Error while querying %s, device %d: %s", string_path.c_str(), index, e.what()); log_printf(ERROR, "Error while querying %s, device %d: %s", string_path.c_str(), index, e.what());
else usleep(try_delay);
} }
else break; else device_unknown = true;
} }
catch(HIDPP::Dispatcher::TimeoutError &e) catch(HIDPP::Dispatcher::TimeoutError &e)
{ {
if(i == max_tries - 1) if(remaining_tries == 1)
log_printf(ERROR, "Device %s (index %d) timed out.", string_path.c_str(), index); log_printf(ERROR, "Device %s (index %d) timed out.", string_path.c_str(), index);
else usleep(try_delay);
} }
catch(std::runtime_error &e) catch(std::runtime_error &e)
{ {
if(i == max_tries - 1) if(remaining_tries == 1)
log_printf(ERROR, "Runtime error on device %d on %s: %s", index, string_path.c_str(), e.what()); log_printf(ERROR, "Runtime error on device %d on %s: %s", index, string_path.c_str(), e.what());
else usleep(try_delay);
} }
}
remaining_tries--;
std::this_thread::sleep_for(TIME_BETWEEN_CONNECTION_TRIES);
} while (device_not_connected && !device_unknown && remaining_tries > 0);
} }
} }
catch(HIDPP::Dispatcher::NoHIDPPReportException &e) { } catch(HIDPP::Dispatcher::NoHIDPPReportException &e) { }