GPIO controller: Fix input and counter

This commit is contained in:
Michael Zanetti 2021-11-01 14:34:24 +01:00
parent e7eae3711f
commit aaac7065c0
2 changed files with 8 additions and 8 deletions

View File

@ -245,11 +245,11 @@ void IntegrationPluginGpio::setupThing(ThingSetupInfo *info)
return info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("Enabling GPIO monitor failed.")); return info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("Enabling GPIO monitor failed."));
} }
connect(monitor, &GpioMonitor::enabledChanged, thing, [thing](bool enabled){ connect(monitor, &GpioMonitor::interruptOccurred, thing, [thing](bool value){
if (thing->thingClassId() == gpioInputRpiThingClassId) { if (thing->thingClassId() == gpioInputRpiThingClassId) {
thing->setStateValue(gpioInputRpiPowerStateTypeId, enabled); thing->setStateValue(gpioInputRpiPowerStateTypeId, value);
} else if (thing->thingClassId() == gpioInputBbbThingClassId) { } else if (thing->thingClassId() == gpioInputBbbThingClassId) {
thing->setStateValue(gpioInputBbbPowerStateTypeId, enabled); thing->setStateValue(gpioInputBbbPowerStateTypeId, value);
} }
}); });
@ -275,9 +275,9 @@ void IntegrationPluginGpio::setupThing(ThingSetupInfo *info)
return info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("Enabling GPIO monitor failed.")); return info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("Enabling GPIO monitor failed."));
} }
connect(monitor, &GpioMonitor::enabledChanged, thing, [this, thing](bool enabled){ connect(monitor, &GpioMonitor::interruptOccurred, thing, [this, thing](bool value){
if (thing->thingClassId() == counterRpiThingClassId || thing->thingClassId() == counterBbbThingClassId) { if (thing->thingClassId() == counterRpiThingClassId || thing->thingClassId() == counterBbbThingClassId) {
if (enabled) { if (value) {
m_counterValues[thing->id()] += 1; m_counterValues[thing->id()] += 1;
} }
} }

View File

@ -36,9 +36,9 @@
#include "gpiodescriptor.h" #include "gpiodescriptor.h"
// libnymea-gpio // libnymea-gpio
#include "gpio.h" #include <gpio.h>
#include "gpiomonitor.h" #include <gpiomonitor.h>
#include "gpiobutton.h" #include <gpiobutton.h>
class IntegrationPluginGpio : public IntegrationPlugin class IntegrationPluginGpio : public IntegrationPlugin
{ {