QueuedTimer trial

SmingHub · Jun 27, 2016 · c2251e0 · c2251e0
1 parent 825f259
commit c2251e0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/sming/sming/core/QueuedDelegate.h b/sming/sming/core/QueuedDelegate.h
@@ -12,6 +12,7 @@
 
 #include "../include/sming_global.h"
 #include "Delegate.h"
+#include "../include/freertos_includes.h"
 
 template<typename ParamType>
 class QueuedDelegate

diff --git a/sming/sming/core/QueuedInterrupt.cpp b/sming/sming/core/QueuedInterrupt.cpp
@@ -10,7 +10,7 @@
 QueuedInterrupt::QueuedInterrupt(int reqPin, GPIO_INT_TYPE reqInterruptType,QueuedInterruptDelegate reqDelegate)
 : QueuedDelegate(reqDelegate), interruptPin(reqPin), interruptType(reqInterruptType)
 {
-	attachInterrupt(interruptPin,Delegate<void()>(&QueuedInterrupt::delegatedInterrupt,this), (GPIO_INT_TYPE)GPIO_PIN_INTR_ANYEDGE);
+	attachInterrupt(interruptPin,Delegate<void()>(&QueuedInterrupt::delegatedInterrupt,this), reqInterruptType);
 }
 
 QueuedInterrupt::~QueuedInterrupt() {

diff --git a/sming/sming/core/Timer.cpp b/sming/sming/core/Timer.cpp
@@ -9,11 +9,13 @@
 
 Timer::Timer()
 {
+	qd = new QueuedDelegate<QueuedTimerMessage>(QueuedTimerDelegate(&Timer::queueHandler,this));
 }
 
 Timer::~Timer()
 {
 	stop();
+	delete qd;
 }
 
 Timer& Timer::initializeMs(uint32_t milliseconds, InterruptCallback callback/* = NULL*/)
@@ -189,6 +191,13 @@ void Timer::processing(void *arg)
 			}
 		}
 
+		if ((ptimer->callback) || (ptimer->delegate_func))
+		{
+			QueuedTimerMessage queuedTimerMessage;
+			queuedTimerMessage.timerMicros = 0; // should be micros()
+			ptimer->qd->sendQueue(queuedTimerMessage);
+		}
+/*
 		if (ptimer->callback)
 		{
 			ptimer->callback();
@@ -197,6 +206,18 @@ void Timer::processing(void *arg)
 		{
 			ptimer->delegate_func();
 		}
+*/
 	}
+}
 
+void Timer::queueHandler(QueuedTimerMessage queuedTimerMessage)
+{
+	if (callback)
+	{
+		callback();
+	}
+	else if (delegate_func)
+	{
+		delegate_func();
+	}
 }
diff --git a/sming/sming/core/Timer.h b/sming/sming/core/Timer.h
@@ -14,6 +14,7 @@
 #include "../wiring/WiringFrameworkDependencies.h"
 #include "../include/sming_global.h"
 #include "espressif/esp_timer.h"
+#include "QueuedDelegate.h"
 
 
 
@@ -27,6 +28,14 @@
 
 typedef Delegate<void()> TimerDelegate;
 
+typedef struct
+{
+   uint32 timerMicros;
+} QueuedTimerMessage;
+
+typedef Delegate<void(QueuedTimerMessage)> QueuedTimerDelegate;
+
+
 class Timer
 {
 public:
@@ -78,6 +87,9 @@ class Timer
 	Timer& IRAM_ATTR initializeUs(uint32_t microseconds, InterruptCallback callback = NULL); // Init in Microseconds.
 	Timer& IRAM_ATTR initializeUs(uint32_t microseconds, TimerDelegate delegateFunction = NULL); // Init in Microseconds.
 
+	QueuedDelegate<QueuedTimerMessage> * qd;
+	void queueHandler(QueuedTimerMessage queuedTimerMessage);
+
 };
 
 #endif /* _SMING_CORE_Timer_H_ */