diff --git a/libnymea-gpio/gpiobutton.cpp b/libnymea-gpio/gpiobutton.cpp index ad1b49c..bb28780 100644 --- a/libnymea-gpio/gpiobutton.cpp +++ b/libnymea-gpio/gpiobutton.cpp @@ -164,7 +164,7 @@ void GpioButton::onTimeout() emit longPressed(); } -void GpioButton::onInterruptOccured(bool value) +void GpioButton::onInterruptOccurred(bool value) { if (value) { // Pressed @@ -206,7 +206,7 @@ bool GpioButton::enable() m_monitor = nullptr; return false; } - connect(m_monitor, &GpioMonitor::interruptOccured, this, &GpioButton::onInterruptOccured); + connect(m_monitor, &GpioMonitor::interruptOccurred, this, &GpioButton::onInterruptOccurred); // Setup timer, if this timer reaches timeout, a long pressed happend m_timer = new QTimer(this); diff --git a/libnymea-gpio/gpiobutton.h b/libnymea-gpio/gpiobutton.h index c4a8ec9..8270383 100644 --- a/libnymea-gpio/gpiobutton.h +++ b/libnymea-gpio/gpiobutton.h @@ -77,7 +77,7 @@ signals: private slots: void onTimeout(); - void onInterruptOccured(bool value); + void onInterruptOccurred(bool value); public slots: bool enable(); diff --git a/libnymea-gpio/gpiomonitor.cpp b/libnymea-gpio/gpiomonitor.cpp index cbd9e85..652c39d 100644 --- a/libnymea-gpio/gpiomonitor.cpp +++ b/libnymea-gpio/gpiomonitor.cpp @@ -147,10 +147,10 @@ void GpioMonitor::setValue(Gpio::Value value) switch (m_value) { case Gpio::ValueLow: - emit interruptOccured(false); + emit interruptOccurred(false); break; case Gpio::ValueHigh: - emit interruptOccured(true); + emit interruptOccurred(true); break; default: break; diff --git a/libnymea-gpio/gpiomonitor.h b/libnymea-gpio/gpiomonitor.h index 5eb1c5d..a960244 100644 --- a/libnymea-gpio/gpiomonitor.h +++ b/libnymea-gpio/gpiomonitor.h @@ -76,7 +76,7 @@ protected: void run() override; signals: - void interruptOccured(bool value); + void interruptOccurred(bool value); void enabledChanged(bool enabled); private slots: diff --git a/nymea-gpio-tool/main.cpp b/nymea-gpio-tool/main.cpp index d72ed3f..2fbfb97 100644 --- a/nymea-gpio-tool/main.cpp +++ b/nymea-gpio-tool/main.cpp @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) }); // Inform about interrupt - QObject::connect(monitor, &GpioMonitor::interruptOccured, [gpioNumber](bool value) { + QObject::connect(monitor, &GpioMonitor::interruptOccurred, [gpioNumber](bool value) { qDebug() << "GPIO" << gpioNumber << "interrupt occured. Current value:" << (value ? "1" : "0"); });