Add Process Task , create readValue vs getValue in SenseData

Author: Toon76

WifiModule/SenseData.cpp

@@ -11,6 +11,14 @@ Scheduler sched;
 
 Sensor SensorArray[MAX_SENSOR_NB];
 
+void ProcessCallback() {
+  //can do some logic here
+  if(SensorArray[0].getValue() > 128)
+    SensorArray[7].setValue(1);
+  else
+    SensorArray[7].setValue(0);
+}
+
 void SamplingCallback() {
     for(int i = 0;i<MAX_SENSOR_NB;i++)
     {
@@ -46,23 +54,19 @@ void SenseData::init(void)
 
 	//Scheduler init
 	sched.init();
-	sched.addTask(SamplingTask);
-	sched.addTask(HistoryTask);
-	SamplingTask.enable();
-	HistoryTask.enable();
+
+  sched.addTask(SamplingTask);
+  sched.addTask(HistoryTask);
+  SamplingTask.enable();
+  HistoryTask.enable();
+
+  Task *ProcessTask = new Task(PROCESS_T, TASK_FOREVER, &ProcessCallback, &sched, true);
   Serial.println("Sense init");
 }
 
 void SenseData::run(void)
 {
 	sched.execute();
-/*  //can do some logic here
-  if(SensorArray[0].getValue() > 128)
-    SensorArray[7].setValue(1);
-  else
-    SensorArray[7].setValue(0);
-
-  */
 }
 
 //void addSensor(Sensor sensor);
@@ -75,7 +79,7 @@ String SenseData::getData(char* name)
     {
       if(strcmp(name,SensorArray[i].m_name) == 0 || strcmp("",name) == 0)
       {
-        ret += "\""+String(SensorArray[i].m_name)+"\":"+SensorArray[i].getValue()+",";
+        ret += "\""+String(SensorArray[i].m_name)+"\":"+SensorArray[i].readValue()+",";
       }
     }
   }
@@ -94,7 +98,7 @@ int16_t SenseData::getValue(char* name)
     {
       if(strcmp(name,SensorArray[i].m_name) == 0 || strcmp("",name) == 0)
       {
-        ret = SensorArray[i].getValue();
+        ret = SensorArray[i].readValue();
       }
     }
   }

WifiModule/SenseData.h

@@ -6,6 +6,7 @@
 #include "Sensor.h"
 
 #define MAX_SENSOR_NB	10
+#define PROCESS_T      1000  //in millisec
 
 class SenseData
 {

WifiModule/Sensor.cpp

@@ -49,10 +49,10 @@ void Sensor::init(char* name, SensorInput_t input, SensorType_t type)
 
 void Sensor::update(void)
 {
-  buffer.push(getValue());
+  buffer.push(readValue());
 }
 
-int16_t Sensor::getValue(void)
+int16_t Sensor::readValue(void)
 {
   float value = 0;
   switch(m_input){
@@ -111,6 +111,12 @@ int16_t Sensor::getValue(void)
   return m_value;
 }
 
+
+int16_t Sensor::getValue(void)
+{
+  return m_value;
+}
+
 void Sensor::setValue(int16_t val)
 {
   m_value = val;

WifiModule/Sensor.h

@@ -66,7 +66,8 @@ class Sensor
   Sensor(void);
   void init(char* name, SensorInput_t input, SensorType_t type);
   void update(void);
-  int16_t getValue(void);
+  int16_t readValue(void); //read the data physically
+  int16_t getValue(void); //read the buffered data
   void setValue(int16_t val);
  private:
 };