Diff: main.cpp

Revision:

7:8664a45f5ce1

Parent:

6:b7f6e0c0f646

Child:

9:f5eae5211225

--- a/main.cpp	Thu Nov 29 18:41:57 2018 +0000
+++ b/main.cpp	Thu Nov 29 19:08:17 2018 +0000
@@ -1,7 +1,6 @@
 #include "mbed.h"
 #include "sample_hardware.hpp"
 #include "Sampler.hpp"
-#include "SerialComms.hpp"
 
 void LCD_Thread(void);
 void SAMP_Thread(void);
@@ -10,8 +9,7 @@
 Thread tLCD, tSAMP, tSERIAL, tSD;
 
 // Define member object
-Sampler m_osample;
-Serialcomms m_oserial;
+Sampler m_oSample;
 
 int main()
 {  
@@ -42,8 +40,8 @@
  {
      while(1)
      {
-        m_osample.SAMP_Queue.call_every(1000, &m_osample, &Sampler::publishSample);     // Publish sample 
-        m_osample.SAMP_Queue.dispatch();
+        m_oSample.SAMP_Queue.call_every(500, &m_oSample, &Sampler::publishSample);     // Publish sample 
+        m_oSample.SAMP_Queue.dispatch();
         while(true) 
         {   // Flash if the event queue is exited.
             yellowLED = 1;
@@ -58,8 +56,8 @@
 {
       while(1)
      {
-        m_oserial.SERIAL_Queue.call_every(1000, &m_oserial, &Serialcomms::updateTerminal);     // Publish sample 
-        m_oserial.SERIAL_Queue.dispatch();
+        m_oSerial.SERIAL_Queue.call_every(1000, &m_oSerial, &Serialcomms::updateTerminal);     // Publish sample 
+        m_oSerial.SERIAL_Queue.dispatch();
         while(true) 
         {   // Flash if the event queue is exited.
             yellowLED = 1;