Diff: main.cpp

Revision:

12:c51f3aba84fe

Parent:

11:1a0a8fd74bc0

Child:

13:1323e2c0b697

--- a/main.cpp	Fri Jun 10 22:34:57 2016 +0000
+++ b/main.cpp	Sat Jun 11 10:14:40 2016 +0000
@@ -7,12 +7,20 @@
 #include "LCDController.h"
 #include "ProximityController.h"
 #include "AlarmController.h"
+#include "MockSensorController.h"
 
 #include "mbed.h"
 #include "rtos.h"
 
 #define MAIN_THREAD_DELAY_MS 1000
 
+#define MOCK(N, F) static inline float N(int i) {return (F);}
+
+
+MOCK(temp_mock, 20.0+0.01*i)
+MOCK(salt_mock, 3.0+0.001*i)
+MOCK(prox_mock, 10.0f)
+
 int main() 
 {
     std::vector<void *> controllers;
@@ -21,13 +29,17 @@
     /* THE FOLLOWING CONTROLLERS CAN BE THREADED BY SETTING THE FIRST ARG TO TRUE */
     /* THE SECOND ARG SPECIFIES THE DELAY AFTER EACH UPDATE, ONLY WHEN THREADED   */
     // -----------------------------------------------------------------------------
-    TemperatureController temperature(false,0);
+    
+    //TemperatureController temperature(false,0);
+    MockSensorController temperature(false,0,temp_mock);
     controllers.push_back((void*)&temperature);
     
-    ProximityController proximity(false,0);
+    //ProximityController proximity(false,0);
+    MockSensorController proximity(false,0,prox_mock);
     controllers.push_back((void*)&proximity);
     
-    SalinityController salt(false,0);
+    //SalinityController salt(false,0);
+    MockSensorController salt(false,0,salt_mock);
     controllers.push_back((void *)&salt);
     
     AlarmController alarm(false,0,&temperature,&salt,&proximity);