diff options
Diffstat (limited to 'Mode/Mode.cpp')
| -rw-r--r-- | Mode/Mode.cpp | 62 |
1 files changed, 48 insertions, 14 deletions
diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp index 2bac839..ef343fd 100644 --- a/Mode/Mode.cpp +++ b/Mode/Mode.cpp @@ -2,6 +2,15 @@ #include "MTSLog.h" /* + * 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 */ union convert16 { @@ -11,12 +20,13 @@ union convert16 { } convertS; -Mode::Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora, GPSPARSER* gps) +Mode::Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora, GPSPARSER* gps, SensorHandler* sensors) : _lcd(lcd), _buttons(buttons), _dot(dot), _lora(lora), _gps(gps), + _sensors(sensors), _main_id(Thread::gettid()), _index(0), _band(_dot->getFrequencyBand()), @@ -56,14 +66,6 @@ bool Mode::appendDataFile(const DataItem& data) { char stats_buf[32]; size_t size; - memset(main_buf, 0, sizeof(main_buf)); - memset(id_buf, 0, sizeof(id_buf)); - memset(lat_buf, 0, sizeof(lat_buf)); - memset(lon_buf, 0, sizeof(lon_buf)); - memset(alt_buf, 0, sizeof(alt_buf)); - memset(time_buf, 0, sizeof(time_buf)); - memset(stats_buf, 0, sizeof(stats_buf)); - snprintf(id_buf, sizeof(id_buf), "%c%ld", (data.type == single) ? 'P' : 'S', data.index); // if we had GPS lock, format GPS data @@ -92,7 +94,7 @@ bool Mode::appendDataFile(const DataItem& data) { } if (data.status) { - float down_snr = (float)data.link.down.snr / 4.0; + float down_snr = (float)data.link.down.snr / 10.0; snprintf(stats_buf, sizeof(stats_buf), "%d,%d,%d,%2.1f", data.link.up.gateways, data.link.up.dBm, @@ -142,6 +144,17 @@ void Mode::updateData(DataItem& data, DataType type, bool status) { data.power = _power; } +void Mode::updateSensorData(SensorItem& data) { + data.accel_data = _sensors->getAcceleration(); + data.baro_data = _sensors->getBarometer(); + data.lux_data_raw = _sensors->getLightRaw(); + data.pressure_raw = _sensors->getPressureRaw(); + data.light = _sensors->getLight(); + data.pressure = _sensors->getPressure(); + data.altitude = _sensors->getAltitude(); + data.temperature = _sensors->getTemp(SensorHandler::CELSIUS); +} + uint32_t Mode::getIndex(DataType type) { uint32_t index = 0; mDot::mdot_file file; @@ -236,7 +249,7 @@ std::vector<uint8_t> Mode::formatSurveyData(DataItem& data) { convertS.f_s=data.link.down.rssi; send_data.push_back(convertS.t_u[1]); send_data.push_back(convertS.t_u[0]); - send_data.push_back(data.link.down.snr); + send_data.push_back((data.ping.down.snr/10) & 0xFF); // collect GPS data if GPS device detected if (_gps->gpsDetected() && ((_data_rate != mDot::SF_10) || (_band == mDot::FB_868))){ @@ -244,16 +257,16 @@ std::vector<uint8_t> Mode::formatSurveyData(DataItem& data) { satfix = (_gps->getNumSatellites() << 4 ) | (_gps->getFixStatus() & 0x0F ); send_data.push_back(satfix); - if (_gps->getLockStatus()){ // if gps has a lock + if (_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(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 + 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]); @@ -272,6 +285,27 @@ std::vector<uint8_t> Mode::formatSurveyData(DataItem& data) { std::vector<uint8_t> Mode::formatSensorData(SensorItem& data) { std::vector<uint8_t> 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_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_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 + 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; } |