From f2a7b7b9472cb9616d4c2b3e087b1c0a87a07c47 Mon Sep 17 00:00:00 2001 From: pixl Date: Fri, 19 Jun 2020 22:51:22 -0400 Subject: [PATCH] Fix long report descriptor check --- src/logid/Device.cpp | 2 +- src/logid/DeviceManager.cpp | 2 ++ src/logid/backend/hidpp/Report.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/logid/Device.cpp b/src/logid/Device.cpp index a5689eb..96a61db 100644 --- a/src/logid/Device.cpp +++ b/src/logid/Device.cpp @@ -6,7 +6,7 @@ using namespace logid; Device::Device(std::string path, backend::hidpp::DeviceIndex index) : _hidpp20 (path, index), _path (path), _index (index) { - log_printf(DEBUG, "logid::Device created on %s:%d"); + log_printf(DEBUG, "logid::Device created on %s:%d", _path.c_str(), _index); } void Device::sleep() diff --git a/src/logid/DeviceManager.cpp b/src/logid/DeviceManager.cpp index c975c1e..e4fd9ca 100644 --- a/src/logid/DeviceManager.cpp +++ b/src/logid/DeviceManager.cpp @@ -14,6 +14,8 @@ using namespace logid::backend; void DeviceManager::addDevice(std::string path) { + log_printf(DEBUG, "Scanning %s for devices.", path.c_str()); + bool defaultExists = true; bool isReceiver = false; try { diff --git a/src/logid/backend/hidpp/Report.cpp b/src/logid/backend/hidpp/Report.cpp index ac8b173..d68ce1e 100644 --- a/src/logid/backend/hidpp/Report.cpp +++ b/src/logid/backend/hidpp/Report.cpp @@ -76,7 +76,7 @@ uint8_t hidpp::getSupportedReports(std::vector&& rdesc) if(it != rdesc.end()) ret |= HIDPP_REPORT_SHORT_SUPPORTED; - it = std::search(rdesc.begin(), rdesc.end(), LongReportDesc.begin(), LongReportDesc2.end()); + it = std::search(rdesc.begin(), rdesc.end(), LongReportDesc.begin(), LongReportDesc.end()); if(it == rdesc.end()) it = std::search(rdesc.begin(), rdesc.end(), LongReportDesc2.begin(), LongReportDesc2.end()); if(it != rdesc.end())