Diff: main.cpp

Revision:

5:f87129ac8bf3

Parent:

4:740cba3f2716

Child:

6:b7f6e0c0f646

diff -r 740cba3f2716 -r f87129ac8bf3 main.cpp
--- a/main.cpp	Tue Nov 27 12:51:34 2018 +0000
+++ b/main.cpp	Thu Nov 29 16:08:28 2018 +0000
@@ -1,23 +1,21 @@
-/* Sampling Code */
- #include "mbed.h"
+#include "mbed.h"
 #include "sample_hardware.hpp"
 #include "Sampler.hpp"
+#include "LCD.hpp"
+#include "message.hpp"
+
+sample_message message;
+
+Thread tLCD;
+Thread tSAMP;
 
 
-Sampler s;   // Initialise the s object
-Ticker t;               // Time Initialisation
-
-void doISR()
-{
-   s.activate();   // Signal the sampling thread to move from WAITING to READY
-}
-    
 
 int main()
 {
     
-    s.sampEQueue.call_every(1000, &Sampler::publishSample);     // Publish sample 
-    
-    s.sampEQueue.dispatch();
+    tLCD.start(LCD_Thread);
+    tSAMP.start(SAMP_Thread);
+    Thread::wait(osWaitForever);
 }
     
\ No newline at end of file