From 2803149e24884ea15f753ea7f4a927ebdb29b039 Mon Sep 17 00:00:00 2001 From: Simon Stuerz Date: Sat, 24 Aug 2013 13:18:28 +0200 Subject: [PATCH] interrupt problems... --- hive/server/hive_pi/radio/radioreciver.cpp | 12 +++++++++--- hive/server/hive_pi/radio/radioreciver.h | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hive/server/hive_pi/radio/radioreciver.cpp b/hive/server/hive_pi/radio/radioreciver.cpp index 252f35f8..26a4df5a 100644 --- a/hive/server/hive_pi/radio/radioreciver.cpp +++ b/hive/server/hive_pi/radio/radioreciver.cpp @@ -17,7 +17,7 @@ RadioReciver::RadioReciver(QObject *parent) : } -void RadioReciver::handleRC433Interrupt() +void RadioReciver::handleInterrupt() { if(!m_enable){ return; @@ -58,6 +58,11 @@ void RadioReciver::handleRC433Interrupt() lastTime = time; } +void RadioReciver::handleRC433Interrupt() +{ + +} + void RadioReciver::handleRC868Interrupt() { @@ -269,8 +274,9 @@ void RadioReciver::setFrequency(RadioReciver::Frequency frequency) if(wiringPiSetup() == -1){ qDebug() << "ERROR: GPIO setup for 433.92 MHz receiver failed."; } - pinMode(2,INPUT); - wiringPiISR(2, INT_EDGE_BOTH, &handleRC433Interrupt); + m_pin433 = 2; + pinMode(m_pin433,INPUT); + wiringPiISR(m_pin433, INT_EDGE_BOTH, handleInterrupt); qDebug() << "GPIO setup for 433.92 MHz receiver ok."; } if(frequency == RadioReciver::RF868MHz){ diff --git a/hive/server/hive_pi/radio/radioreciver.h b/hive/server/hive_pi/radio/radioreciver.h index d7cb1ec2..cefb8b9b 100644 --- a/hive/server/hive_pi/radio/radioreciver.h +++ b/hive/server/hive_pi/radio/radioreciver.h @@ -17,12 +17,16 @@ public: }; private: + void handleInterrupt(); static void handleRC433Interrupt(); static void handleRC868Interrupt(); static void detectProtocol(int signalCount); static float parseTemperature(QByteArray codeBin); + int m_pin433; + int m_pin868; + signals: public slots: