Diff: Sampler.hpp

Revision:

6:b7f6e0c0f646

Parent:

5:f87129ac8bf3

Child:

7:8664a45f5ce1

--- a/Sampler.hpp	Thu Nov 29 16:08:28 2018 +0000
+++ b/Sampler.hpp	Thu Nov 29 18:41:57 2018 +0000
@@ -1,40 +1,44 @@
 #ifndef _SAMPLER_
 #define _SAMPLER_
-#include "message.hpp"
 #include "mbed.h"
 #include "LCD.hpp"
+#include "sample_hardware.hpp"
 #define Activate_Flag 1
 
-EventQueue SAMP_Queue;  //create an event queue for main
-
 class Sampler
 {
 private:
-        EventQueue sampEQueue;                  //Initialise the EventQueue
+    
 public: 
+    EventQueue SAMP_Queue;                  //Initialise the EventQueue
+
     void publishSample()
     {
-        getData();
-        m_oDisplay.LCD_Queue.call(&m_oDisplay, &LCD_Data::update_sensor_info, sample);
+        sample_message message = getData();
+        m_oDisplay.LCD_Queue.call(&m_oDisplay, &LCD_Data::update_sensor_info, message);
         //SD_Queue.call(&m_oSD_data, &SD_Queue::update_sensor_info, sample_data, sample_data);
         //SERIAL_Queue.call(&m_oSERIAL_data, &SERIAL_Queue::update_sensor_info, sample_data, sample_data);
     }
-    void getData()
-    {
-        int sw1State = SW1.read();
-        int sw2State = SW2.read();        
+    
+    sample_message getData()
+    {       
         float temp = sensor.getTemperature();
         float pressure = sensor.getPressure();
+        float LDR = adcIn.read();
         #ifdef BME
         float humidity = sensor.getHumidity();
         #endif
-        sample.temp = temp;
-        sample.pressure = pressure;
-        sample.sw1State = sw1State;
-        sample.swState = sw1State;
+        sample_message msg; // Define instance of message structure
+        msg.temp = temp;
+        msg.pressure = pressure;
+        msg.ldr = LDR;
+        return msg;
     }
+    
+    void updateTimeData();
+
     Sampler()   //Constructor 
-    {   
+    {
     }
     ~Sampler() //Destructor - should the instance go out of scope, this is called
     {