From 0ae5b17f7977f197e59110d5cf6450d49ae0ba24 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Thu, 10 Dec 2015 15:45:15 -0600 Subject: update mdot-library to get SNR fix & update accordingly --- Layout/LayoutSurveySuccess.cpp | 2 +- Mode/Mode.cpp | 4 ++-- mdot-library | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Layout/LayoutSurveySuccess.cpp b/Layout/LayoutSurveySuccess.cpp index 01a0c94..2f6a732 100644 --- a/Layout/LayoutSurveySuccess.cpp +++ b/Layout/LayoutSurveySuccess.cpp @@ -76,7 +76,7 @@ void LayoutSurveySuccess::updateStats(LoRaHandler::LoRaPing ping) { writeField(_fDownRssi, buf, size); memset(buf, 0, sizeof(buf)); - size = snprintf(buf, sizeof(buf), "%2.1f", (float)ping.down.snr / 4.0); + size = snprintf(buf, sizeof(buf), "%2.1f", (float)ping.down.snr / 10.0); writeField(_fDownSnr, buf, size); endUpdate(); diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp index 32f67ad..d05f4b0 100644 --- a/Mode/Mode.cpp +++ b/Mode/Mode.cpp @@ -103,7 +103,7 @@ bool Mode::appendDataFile(const DataItem& data) { if (data.status) { float up_snr = (float)data.ping.up.snr / 10.0; - float down_snr = (float)data.ping.down.snr / 4.0; + float down_snr = (float)data.ping.down.snr / 10.0; snprintf(stats_buf, sizeof(stats_buf), "%d,%2.1f,%d,%2.1f", abs(data.ping.up.rssi), up_snr, @@ -258,7 +258,7 @@ std::vector Mode::formatSurveyData(DataItem& data) { 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); + 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))){ diff --git a/mdot-library b/mdot-library index 15174ec..4845711 160000 --- a/mdot-library +++ b/mdot-library @@ -1 +1 @@ -Subproject commit 15174ec09a26d83f63ec196d460a3c501d167472 +Subproject commit 484571143900dc9a8d1e74b6f2a69a4154a8cb3d -- cgit v1.2.3