mirrors/logiops
1
0
Fork 0
mirror of https://github.com/PixlOne/logiops.git synced 2025-09-14 13:56:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only call wakeup test once

Browse Source 
Ensures that wakeup check does not occur multiple times and possibly
create new event handlers on every HID packet.
This commit is contained in:
pixl 2023-05-12 17:23:04 -04:00
parent f85cd5ba62
commit a361f206ff
No known key found for this signature in database
GPG Key ID: 1866C148CD593B6E
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/logid/Device.cpp
View File

@ -184,7 +184,6 @@ void Device::sleep() {
void Device::wakeup() { void Device::wakeup() {
std::lock_guard<std::mutex> lock(_state_lock); std::lock_guard<std::mutex> lock(_state_lock);
logPrintf(INFO, "%s:%d woke up.", _path.c_str(), _index);
reconfigure(); reconfigure();
@ -192,6 +191,8 @@ void Device::wakeup() {
_awake = true; _awake = true;
_ipc_interface->notifyStatus(); _ipc_interface->notifyStatus();
} }
logPrintf(INFO, "%s:%d woke up.", _path.c_str(), _index);
} }
void Device::reconfigure() { void Device::reconfigure() {

8
src/logid/backend/hidpp10/ReceiverMonitor.cpp
View File

@ -159,19 +159,25 @@ void ReceiverMonitor::enumerate() {
void ReceiverMonitor::waitForDevice(hidpp::DeviceIndex index) { void ReceiverMonitor::waitForDevice(hidpp::DeviceIndex index) {
auto handler_id = std::make_shared<EventHandlerLock<raw::RawDevice>>(); auto handler_id = std::make_shared<EventHandlerLock<raw::RawDevice>>();
auto executed = std::make_shared<bool>(false);
*handler_id = _receiver->rawDevice()->addEventHandler( *handler_id = _receiver->rawDevice()->addEventHandler(
{[index](const std::vector<uint8_t>& report) -> bool { {[index](const std::vector<uint8_t>& report) -> bool {
return report[Offset::DeviceIndex] == index; return report[Offset::DeviceIndex] == index;
}, },
[self_weak = _self, index, handler_id]( [self_weak = _self, index, handler_id, executed](
[[maybe_unused]] const std::vector<uint8_t>& report) { [[maybe_unused]] const std::vector<uint8_t>& report) {
if (*executed)
return;
hidpp::DeviceConnectionEvent event{}; hidpp::DeviceConnectionEvent event{};
event.withPayload = false; event.withPayload = false;
event.linkEstablished = true; event.linkEstablished = true;
event.index = index; event.index = index;
event.fromTimeoutCheck = true; event.fromTimeoutCheck = true;
*executed = true;
run_task([self_weak, event, handler_id]() { run_task([self_weak, event, handler_id]() {
*handler_id = {}; *handler_id = {};
if (auto self = self_weak.lock()) { if (auto self = self_weak.lock()) {

2
src/logid/features/RemapButton.cpp
View File

@ -63,7 +63,7 @@ RemapButton::RemapButton(Device* dev) : DeviceFeature(dev),
if ((action->reprogFlags() & hidpp20::ReprogControls::RawXYDiverted) && if ((action->reprogFlags() & hidpp20::ReprogControls::RawXYDiverted) &&
(!_reprog_controls->supportsRawXY() || (!_reprog_controls->supportsRawXY() ||
!(info.additionalFlags & hidpp20::ReprogControls::RawXY))) !(info.additionalFlags & hidpp20::ReprogControls::RawXY)))
logPrintf(WARN, "%s: Cannot divert raw XY movements for CID 0x%02x", logPrintf(WARN, "%s: 'Cannot divert raw XY movements for CID 0x%02x",
_device->name().c_str(), info.controlID); _device->name().c_str(), info.controlID);
report.flags |= action->reprogFlags(); report.flags |= action->reprogFlags();