Alix Germany / Mbed OS Coursework_Version_8

Version 8, working version with Alix, sams and ollies code. Displays time, date and sensor info onto terminal, LCD and networking, and saves onto SD card.

Dependencies:   BMP280 ELEC350-Practicals-FZ429 TextLCD BME280 ntp-client

Diff: Sampler.hpp

Revision:
7:8664a45f5ce1
Parent:
6:b7f6e0c0f646
Child:
8:7d218affea71
--- a/Sampler.hpp	Thu Nov 29 18:41:57 2018 +0000
+++ b/Sampler.hpp	Thu Nov 29 19:08:17 2018 +0000
@@ -2,6 +2,7 @@
 #define _SAMPLER_
 #include "mbed.h"
 #include "LCD.hpp"
+#include "SerialComms.hpp"
 #include "sample_hardware.hpp"
 #define Activate_Flag 1
 
@@ -17,14 +18,14 @@
         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);
+        m_oSerial.SERIAL_Queue.call(&m_oSerial, &Serialcomms::setsampledata, message);
     }
     
     sample_message getData()
     {       
         float temp = sensor.getTemperature();
         float pressure = sensor.getPressure();
-        float LDR = adcIn.read();
+        float LDR = adcIn.read()*4095;
         #ifdef BME
         float humidity = sensor.getHumidity();
         #endif