From ed155aa2e80dc2d929b10eb978880b92eaa1463a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 9 Sep 2021 08:31:41 +0200 Subject: [PATCH] Update to libnymea-gpio --- debian/control | 1 + unipi/unipi.cpp | 2 +- unipi/unipi.h | 4 ++-- unipi/unipi.pro | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 59c08b1..53b179e 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: options Maintainer: Bernhard Trinnes Build-depends: debhelper (>= 9.0.0), libnymea-dev (>= 0.17), + libnymea-gpio-dev, libqt5serialbus5-dev, libqt5serialport5-dev, nymea-dev-tools:native, diff --git a/unipi/unipi.cpp b/unipi/unipi.cpp index e249b14..25aaaa2 100644 --- a/unipi/unipi.cpp +++ b/unipi/unipi.cpp @@ -97,7 +97,7 @@ bool UniPi::init() QProcess::execute(QString("gpio -g mode %1 up").arg(pin)); QTimer::singleShot(1000, this, [gpioMonitor, circuit, this]() { emit digitalInputStatusChanged(circuit, gpioMonitor->value()); //set initial status - connect(gpioMonitor, &GpioMonitor::valueChanged, this, &UniPi::onInputValueChanged); + connect(gpioMonitor, &GpioMonitor::enabledChanged, this, &UniPi::onInputValueChanged); m_monitorGpios.insert(gpioMonitor, circuit); }); } diff --git a/unipi/unipi.h b/unipi/unipi.h index 7dc74f9..a3b4a64 100644 --- a/unipi/unipi.h +++ b/unipi/unipi.h @@ -36,8 +36,8 @@ #include "mcp342xchannel.h" #include "unipipwm.h" -#include "hardware/gpio.h" -#include "hardware/gpiomonitor.h" +#include "gpio.h" +#include "gpiomonitor.h" #include "hardware/i2c/i2cmanager.h" class I2CDevice; diff --git a/unipi/unipi.pro b/unipi/unipi.pro index 28b20a2..5e798fd 100644 --- a/unipi/unipi.pro +++ b/unipi/unipi.pro @@ -3,6 +3,8 @@ include(../plugins.pri) LIBS += \ -li2c \ +PKGCONFIG += nymea-gpio + QT += \ network \ serialport \