Add DeviceStatus device feature

Should fix bug #66.
This commit is contained in:
pixl 2020-07-18 22:55:51 -04:00
parent 1551c4ded0
commit cfcdca00a0
No known key found for this signature in database
GPG Key ID: 1866C148CD593B6E
4 changed files with 106 additions and 0 deletions

View File

@ -20,6 +20,7 @@ add_executable(logid
features/SmartShift.cpp features/SmartShift.cpp
features/HiresScroll.cpp features/HiresScroll.cpp
features/RemapButton.cpp features/RemapButton.cpp
features/DeviceStatus.cpp
actions/Action.cpp actions/Action.cpp
actions/NullAction.cpp actions/NullAction.cpp
actions/KeypressAction.cpp actions/KeypressAction.cpp

View File

@ -23,6 +23,7 @@
#include "features/RemapButton.h" #include "features/RemapButton.h"
#include "backend/hidpp20/features/Reset.h" #include "backend/hidpp20/features/Reset.h"
#include "features/HiresScroll.h" #include "features/HiresScroll.h"
#include "features/DeviceStatus.h"
using namespace logid; using namespace logid;
using namespace logid::backend; using namespace logid::backend;
@ -51,6 +52,7 @@ void Device::_init()
_addFeature<features::SmartShift>("smartshift"); _addFeature<features::SmartShift>("smartshift");
_addFeature<features::HiresScroll>("hiresscroll"); _addFeature<features::HiresScroll>("hiresscroll");
_addFeature<features::RemapButton>("remapbutton"); _addFeature<features::RemapButton>("remapbutton");
_addFeature<features::DeviceStatus>("devicestatus");
_makeResetMechanism(); _makeResetMechanism();
reset(); reset();

View File

@ -0,0 +1,62 @@
/*
* Copyright 2019-2020 PixlOne
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "DeviceStatus.h"
#include "../util/task.h"
#define EVENTHANDLER_NAME "devicestatus"
using namespace logid::features;
using namespace logid::backend;
DeviceStatus::DeviceStatus(logid::Device *dev) : DeviceFeature(dev)
{
try {
_wireless_device_status =std::make_shared<
hidpp20::WirelessDeviceStatus>(&dev->hidpp20());
} catch(hidpp20::UnsupportedFeature& e) {
throw UnsupportedFeature();
}
}
void DeviceStatus::configure()
{
// Do nothing
}
void DeviceStatus::listen()
{
if(_device->hidpp20().eventHandlers().find(EVENTHANDLER_NAME) ==
_device->hidpp20().eventHandlers().end()) {
auto handler = std::make_shared<hidpp::EventHandler>();
handler->condition = [index=_wireless_device_status->featureIndex()](
const hidpp::Report& report)->bool {
return report.feature() == index && report.function() ==
hidpp20::WirelessDeviceStatus::StatusBroadcast;
};
handler->callback = [dev=this->_device](
const hidpp::Report& report)->void {
auto event = hidpp20::WirelessDeviceStatus::statusBroadcastEvent(
report);
if(event.reconfNeeded)
task::spawn([dev](){ dev->wakeup(); });
};
_device->hidpp20().addEventHandler(EVENTHANDLER_NAME, handler);
}
}

View File

@ -0,0 +1,41 @@
/*
* Copyright 2019-2020 PixlOne
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef LOGID_FEATURE_DEVICESTATUS_H
#define LOGID_FEATURE_DEVICESTATUS_H
#include "DeviceFeature.h"
#include "../Device.h"
#include "../backend/hidpp20/features/WirelessDeviceStatus.h"
namespace logid {
namespace features
{
class DeviceStatus : public DeviceFeature
{
public:
explicit DeviceStatus(Device* dev);
virtual void configure();
virtual void listen();
private:
std::shared_ptr<backend::hidpp20::WirelessDeviceStatus>
_wireless_device_status;
};
}}
#endif //LOGID_FEATURE_DEVICESTATUS_H