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