From 96b7412369c44c3cc7608859c19161073cd114da Mon Sep 17 00:00:00 2001
From: Leon Lindenfelser <llindenfelser@multitech.com>
Date: Wed, 9 Dec 2015 15:57:07 -0600
Subject: Display sensor data on demo screen.

---
 Mode/Mode.cpp     |  3 ++-
 Mode/Mode.h       |  3 ++-
 Mode/ModeDemo.cpp | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'Mode')

diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp
index a97b226..47dbc29 100644
--- a/Mode/Mode.cpp
+++ b/Mode/Mode.cpp
@@ -155,7 +155,7 @@ void Mode::updateData(DataItem& data, DataType type, bool status) {
     data.power = _power;
 }
 
-void Mode::updateSensors(SensorItem& data) {
+void Mode::updateSensorData(SensorItem& data) {
     data.accel_data = _mdot_sensors.getAcceleration();
     data.baro_data = _mdot_sensors.getBarometer();
     data.lux_data_raw = _mdot_sensors.getLightRaw();
@@ -163,6 +163,7 @@ void Mode::updateSensors(SensorItem& data) {
     data.light = _mdot_sensors.getLight();
     data.pressure = _mdot_sensors.getPressure();
     data.altitude = _mdot_sensors.getAltitude();
+    data.temperature = _mdot_sensors.getTemp(SensorHandler::CELSIUS);
 }
 
 uint32_t Mode::getIndex(DataType type) {
diff --git a/Mode/Mode.h b/Mode/Mode.h
index ca8433a..6b4e24f 100644
--- a/Mode/Mode.h
+++ b/Mode/Mode.h
@@ -42,6 +42,7 @@ class Mode {
             float light;
             float pressure;
 			float altitude;
+			float temperature;			
         } SensorItem;		
 
         Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora, GPSPARSER* gps);
@@ -53,7 +54,7 @@ class Mode {
         bool deleteDataFile();
         bool appendDataFile(const DataItem& data);
         void updateData(DataItem& data, DataType type, bool status);
-		void updateSensors(SensorItem& data);
+		void updateSensorData(SensorItem& data);
         uint32_t getIndex(DataType type);
 
         std::vector<uint8_t> formatSurveyData(DataItem& data);
diff --git a/Mode/ModeDemo.cpp b/Mode/ModeDemo.cpp
index e70ccbd..dcc06e6 100644
--- a/Mode/ModeDemo.cpp
+++ b/Mode/ModeDemo.cpp
@@ -138,6 +138,16 @@ bool ModeDemo::start() {
             _lora->send(s_data);
             osDelay(500);
         }
+        if(_state != show_help){
+            updateSensorData(_data);
+            _sam.updateAccelerationX(_data.accel_data._x);
+            _sam.updateAccelerationY(_data.accel_data._y);
+            _sam.updateAccelerationZ(_data.accel_data._z);
+    		_sam.updatePressure(_data.pressure);
+    		_sam.updateAltitude(_data.altitude);
+    		_sam.updateTemperature(_data.temperature);
+    		_sam.updateLight(_data.light);        
+        }
     }
 }
 
-- 
cgit v1.2.3