From e0116023a927495c8cfa9249925157228efe3fa9 Mon Sep 17 00:00:00 2001 From: Leon Lindenfelser Date: Wed, 2 Dec 2015 16:40:57 -0600 Subject: added sensor handler --- Mode/Mode.cpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'Mode') diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp index f049e33..73292dc 100644 --- a/Mode/Mode.cpp +++ b/Mode/Mode.cpp @@ -3,6 +3,15 @@ const char* Mode::_file_name = "SurveyData.txt"; +/* + * union for converting from 32-bit to 4 8-bit values + */ +union convert32 { + int32_t f_s; // convert from signed 32 bit int + uint32_t f_u; // convert from unsigned 32 bit int + uint8_t t_u[4]; // convert to 8 bit unsigned array +}convertL; + /* * union for converting from 16- bit to 2 8-bit values */ @@ -271,6 +280,27 @@ std::vector Mode::formatSurveyData(DataItem& data) { std::vector Mode::formatSensorData(SensorItem& data) { std::vector send_data; + send_data.clear(); + send_data.push_back(0x0E); // key for Current Acceleration 3-Axis Value + convertS.f_s = data.accel_data._x *4; // shift data 2 bits while retaining sign + send_data.push_back(convertS.t_u[1]); // get 8 MSB of 14 bit value + convertS.f_s = data.accel_data._y * 4; // shift data 2 bits while retaining sign + send_data.push_back(convertS.t_u[1]); // get 8 MSB of 14 bit value + convertS.f_s = data.accel_data._z * 4; // shift data 2 bits while retaining sign + send_data.push_back(convertS.t_u[1]); // get 8 MSB of 14 bit value + send_data.push_back(0x08); // key for Current Pressure Value + convertL.f_u = data.pressure; // pressure data is 20 bits unsigned + send_data.push_back(convertL.t_u[2]); + send_data.push_back(convertL.t_u[1]); + send_data.push_back(convertL.t_u[0]); + send_data.push_back(0x05); // key for Current Ambient Light Value + convertS.f_u = data.lux_data; // data is 16 bits unsigned + send_data.push_back(convertS.t_u[1]); + send_data.push_back(convertS.t_u[0]); + send_data.push_back(0x0B); // key for Current Temperature Value + convertS.f_s = data.baro_data._temp; // temperature is signed 12 bit + send_data.push_back(convertS.t_u[1]); + send_data.push_back(convertS.t_u[0]); return send_data; } -- cgit v1.2.3 From 965622efb5fa3bcb4a1c42aa55a5eda101b99370 Mon Sep 17 00:00:00 2001 From: Leon Lindenfelser Date: Thu, 3 Dec 2015 16:32:43 -0600 Subject: Added update sensor function. Cleaned up sensorhandler so it compiles and hopefully works. --- Mode/Mode.cpp | 10 +++++++++- Mode/Mode.h | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'Mode') diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp index 73292dc..059ddb3 100644 --- a/Mode/Mode.cpp +++ b/Mode/Mode.cpp @@ -36,7 +36,8 @@ Mode::Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora) _next_tx(0), _send_data(false), _gpsUART(PA_2, PA_3), - _mdot_gps(&_gpsUART) + _mdot_gps(&_gpsUART), + _mdot_sensors() {} Mode::~Mode() {} @@ -152,6 +153,13 @@ void Mode::updateData(DataItem& data, DataType type, bool status) { data.power = _power; } +void Mode::updateSensors(SensorItem& data) { + data.accel_data = _mdot_sensors.getAcceleration(); + data.baro_data = _mdot_sensors.getBarometer(); + data.lux_data = _mdot_sensors.getLight(); + data.pressure = _mdot_sensors.getPressure(); +} + uint32_t Mode::getIndex(DataType type) { uint32_t index = 0; mDot::mdot_file file; diff --git a/Mode/Mode.h b/Mode/Mode.h index 5d41ed1..d97dfb1 100644 --- a/Mode/Mode.h +++ b/Mode/Mode.h @@ -9,6 +9,7 @@ #include "ISL29011.h" #include "MMA845x.h" #include "MPL3115A2.h" +#include "SensorHandler.h" class Mode { public: @@ -47,6 +48,7 @@ class Mode { bool deleteDataFile(); bool appendDataFile(const DataItem& data); void updateData(DataItem& data, DataType type, bool status); + void updateSensors(SensorItem& data); uint32_t getIndex(DataType type); std::vector formatSurveyData(DataItem& data); @@ -71,6 +73,7 @@ class Mode { bool _send_data; mts::MTSSerial _gpsUART; GPSPARSER _mdot_gps; + SensorHandler _mdot_sensors; }; #endif -- cgit v1.2.3 From cbcf16a4dafeb8c1e2120c3cc08e2c2ef72e164f Mon Sep 17 00:00:00 2001 From: Leon Lindenfelser Date: Tue, 8 Dec 2015 16:17:13 -0600 Subject: Added more getters to the sensor handler. Added test code in main to print out data from getters. --- Mode/Mode.cpp | 9 ++++++--- Mode/Mode.h | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'Mode') diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp index 059ddb3..8268a4a 100644 --- a/Mode/Mode.cpp +++ b/Mode/Mode.cpp @@ -156,8 +156,11 @@ void Mode::updateData(DataItem& data, DataType type, bool status) { void Mode::updateSensors(SensorItem& data) { data.accel_data = _mdot_sensors.getAcceleration(); data.baro_data = _mdot_sensors.getBarometer(); - data.lux_data = _mdot_sensors.getLight(); + data.lux_data_raw = _mdot_sensors.getLightRaw(); + data.pressure_raw = _mdot_sensors.getPressureRaw(); + data.light = _mdot_sensors.getLight(); data.pressure = _mdot_sensors.getPressure(); + data.altitude = _mdot_sensors.getAltitude(); } uint32_t Mode::getIndex(DataType type) { @@ -297,12 +300,12 @@ std::vector Mode::formatSensorData(SensorItem& data) { convertS.f_s = data.accel_data._z * 4; // shift data 2 bits while retaining sign send_data.push_back(convertS.t_u[1]); // get 8 MSB of 14 bit value send_data.push_back(0x08); // key for Current Pressure Value - convertL.f_u = data.pressure; // pressure data is 20 bits unsigned + convertL.f_u = data.pressure_raw; // pressure data is 20 bits unsigned send_data.push_back(convertL.t_u[2]); send_data.push_back(convertL.t_u[1]); send_data.push_back(convertL.t_u[0]); send_data.push_back(0x05); // key for Current Ambient Light Value - convertS.f_u = data.lux_data; // data is 16 bits unsigned + convertS.f_u = data.lux_data_raw; // data is 16 bits unsigned send_data.push_back(convertS.t_u[1]); send_data.push_back(convertS.t_u[0]); send_data.push_back(0x0B); // key for Current Temperature Value diff --git a/Mode/Mode.h b/Mode/Mode.h index d97dfb1..ff9ba6c 100644 --- a/Mode/Mode.h +++ b/Mode/Mode.h @@ -35,9 +35,12 @@ class Mode { typedef struct { MMA845x_DATA accel_data; MPL3115A2_DATA baro_data; - uint16_t lux_data; - uint32_t pressure; - } SensorItem; + uint16_t lux_data_raw; + uint32_t pressure_raw; + float light; + float pressure; + float altitude; + } SensorItem; Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora); ~Mode(); -- cgit v1.2.3