From 8f96af37d65f62e0ee087b45905d5bb4e3fa7776 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Mon, 23 Nov 2015 15:09:44 -0600 Subject: stub out functions & struct for formatting data packets for both survey and demo modes --- Mode/Mode.cpp | 12 ++++++++++++ Mode/Mode.h | 14 ++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'Mode') diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp index ba60c01..5ae3528 100644 --- a/Mode/Mode.cpp +++ b/Mode/Mode.cpp @@ -127,3 +127,15 @@ void Mode::updateData(DataItem& data, DataType type, bool status) { data.power = _power; } +std::vector Mode::formatSurveyData(DataItem& data) { + std::vector send_data; + + return send_data; +} + +std::vector Mode::formatSensorData(SensorItem& data) { + std::vector send_data; + + return send_data; +} + diff --git a/Mode/Mode.h b/Mode/Mode.h index 8a4f030..96c27b1 100644 --- a/Mode/Mode.h +++ b/Mode/Mode.h @@ -6,6 +6,10 @@ #include "mDot.h" #include "LoRaHandler.h" #include "GPSPARSER.h" +#include "ISL29011.h" +#include "MMA845x.h" +#include "MPL3115A2.h" +#include "GPSPARSER.h" class Mode { public: @@ -28,6 +32,13 @@ class Mode { uint32_t power; } DataItem; + typedef struct { + MMA845x_DATA accel_data; + MPL3115A2_DATA baro_data; + uint16_t lux_data; + uint32_t pressure; + } SensorItem; + Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora); ~Mode(); @@ -38,6 +49,9 @@ class Mode { bool appendDataFile(const DataItem& data); void updateData(DataItem& data, DataType type, bool status); + std::vector formatSurveyData(DataItem& data); + std::vector formatSensorData(SensorItem& data); + DOGS102* _lcd; ButtonHandler* _buttons; mDot* _dot; -- cgit v1.2.3 From 96fd7995d2d2ae16c2be7ed30b1e4aacc79d3a61 Mon Sep 17 00:00:00 2001 From: Leon Lindenfelser Date: Tue, 1 Dec 2015 12:01:52 -0600 Subject: Added GPS parser object and survey data packet. --- Mode/Mode.cpp | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- Mode/Mode.h | 3 ++- 2 files changed, 63 insertions(+), 3 deletions(-) (limited to 'Mode') diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp index 5ae3528..a30ac6e 100644 --- a/Mode/Mode.cpp +++ b/Mode/Mode.cpp @@ -3,6 +3,16 @@ const char* Mode::_file_name = "SurveyData.txt"; +/* + * union for converting from 16- bit to 2 8-bit values + */ +union convert16 { + int16_t f_s; // convert from signed 16 bit int + uint16_t f_u; // convert from unsigned 16 bit int + uint8_t t_u[2]; // convert to 8 bit unsigned array +} convertS; + + Mode::Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora) : _lcd(lcd), _buttons(buttons), @@ -15,7 +25,9 @@ Mode::Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora) _data_rate(mDot::SF_7), _power(2), _next_tx(0), - _send_data(false) + _send_data(false), + _gpsUART(PA_2, PA_3), + _mdot_gps(&_gpsUART) {} Mode::~Mode() {} @@ -121,7 +133,9 @@ void Mode::updateData(DataItem& data, DataType type, bool status) { data.index = _index; data.status = status; data.lock = 0; - // TODO add GPS info + data.gps_longitude = _mdot_gps.getLongitude(); + data.gps_latitude = _mdot_gps.getLatitude(); + data.gps_altitude = _mdot_gps.getAltitude(); data.ping = _ping_result; data.data_rate = _data_rate; data.power = _power; @@ -129,6 +143,51 @@ void Mode::updateData(DataItem& data, DataType type, bool status) { std::vector Mode::formatSurveyData(DataItem& data) { std::vector send_data; + uint8_t satfix; + + send_data.clear(); + send_data.push_back(0x1D); // key for start of data structure + send_data.push_back(0x1A); // key for uplink QOS + RF Pwr + convertS.f_s = data.ping.up.rssi; + send_data.push_back(convertS.t_u[1]); + send_data.push_back(convertS.t_u[0]); + send_data.push_back((data.ping.up.snr/10) & 0xFF); + send_data.push_back(data.power); + + send_data.push_back(0x1B); // key for downlink QOS + convertS.f_s=data.ping.down.rssi; + send_data.push_back(convertS.t_u[1]); + send_data.push_back(convertS.t_u[0]); + send_data.push_back(data.ping.down.snr); + + // collect GPS data if GPS device detected + if (_mdot_gps.gpsDetected() && ((_data_rate != mDot::SF_10) || (_band == mDot::FB_868))){ + send_data.push_back(0x19); // key for GPS Lock Status + satfix = (_mdot_gps.getNumSatellites() << 4 ) | (_mdot_gps.getFixStatus() & 0x0F ); + send_data.push_back(satfix); + + if (_mdot_gps.getLockStatus()){ // if gps has a lock + // Send GPS data if GPS device locked + send_data.push_back(0x15); // key for GPS Latitude + send_data.push_back(data.gps_latitude.degrees); + send_data.push_back(data.gps_latitude.minutes); + convertS.f_s = data.gps_latitude.seconds; + send_data.push_back(convertS.t_u[1]); + send_data.push_back(convertS.t_u[0]); + + send_data.push_back(0x16); // key for GPS Longitude + convertS.f_s = data.gps_longitude.degrees; + send_data.push_back(convertS.t_u[1]); + send_data.push_back(convertS.t_u[0]); + + send_data.push_back(data.gps_longitude.minutes); + convertS.f_s = data.gps_longitude.seconds; + send_data.push_back(convertS.t_u[1]); + send_data.push_back(convertS.t_u[0]); + } + } + // key for end of data structure + send_data.push_back(0x1D); return send_data; } diff --git a/Mode/Mode.h b/Mode/Mode.h index 96c27b1..8c7b0d9 100644 --- a/Mode/Mode.h +++ b/Mode/Mode.h @@ -9,7 +9,6 @@ #include "ISL29011.h" #include "MMA845x.h" #include "MPL3115A2.h" -#include "GPSPARSER.h" class Mode { public: @@ -69,6 +68,8 @@ class Mode { LoRaHandler::LoRaPing _ping_result; uint8_t _state; bool _send_data; + mts::MTSSerial _gpsUART; + GPSPARSER _mdot_gps; }; #endif -- cgit v1.2.3