Merge branch 'Semtech/GpsSurveryMode'

Conflicts:
	main.cpp

9 files changed, 732 insertions, 26 deletions

diff --git a/Layout/LayoutJoin.cpp b/Layout/LayoutJoin.cpp
index e115773..a0ec1ee 100644
--- a/Layout/LayoutJoin.cpp
+++ b/Layout/LayoutJoin.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) <2016> <MultiTech Systems>, MIT License
+/* /* Copyright (c) <2016> <MultiTech Systems>, MIT License
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
  * and associated documentation files (the "Software"), to deal in the Software without restriction, 
@@ -75,8 +75,12 @@ void LayoutJoin::updateFsb(uint8_t band) {
     writeField(_fFsb, buf, size, true);
 }
 
-void LayoutJoin::updateRate(std::string rate) {
-    writeField(_fRate, rate, true);
+void LayoutJoin::updateRate(uint8_t rate) {
+    char buf[8];
+    size_t size;
+
+    size = snprintf(buf, sizeof(buf), "%u", rate);
+    writeField(_fRate, buf, size, true);
 }
 
 void LayoutJoin::updatePower(uint32_t power) {
@@ -119,3 +123,31 @@ void LayoutJoin::displayCancel(bool display) {
     writeField(_fCancel, str, true);
 }
 
+void LayoutJoin::updateJoinFsb(uint8_t band) {
+    char buf[8];
+    size_t size;
+
+    size = snprintf(buf, sizeof(buf), "%u", band);
+    writeField(_fFsb, buf, size, true);
+    size = snprintf(buf, sizeof(buf), "     %u", band);
+    writeField(_fCancel, buf, size, true);
+}
+
+void LayoutJoin::displayEditFsb(uint8_t rate, uint32_t power, uint8_t band, string key, string id){    
+    clear();
+    startUpdate();
+
+    writeLabel(_lId);
+    writeLabel(_lKey);
+    writeLabel(_lFsb);
+    writeLabel(_lRate);
+    writeLabel(_lPower);
+    writeField(_fCountdown, string("Join"), true);
+    updateId(id);
+    updateKey(key);
+    updateJoinFsb(band);
+    updateRate(rate);
+    updatePower(power);
+    
+    endUpdate();  
+}
diff --git a/Layout/LayoutJoin.h b/Layout/LayoutJoin.h
index 56cea3f..c493ce2 100644
--- a/Layout/LayoutJoin.h
+++ b/Layout/LayoutJoin.h
@@ -28,11 +28,13 @@ class LayoutJoin : public Layout {
         ~LayoutJoin();
 
         void display();
+        void displayEditFsb(uint8_t rate, uint32_t power, uint8_t band, string key, string id);
 
         void updateId(std::string id);
         void updateKey(std::string key);
         void updateFsb(uint8_t band);
-        void updateRate(std::string rate);
+        void updateJoinFsb(uint8_t band);
+        void updateRate(uint8_t rate);
         void updatePower(uint32_t power);
         void updateAttempt(uint32_t attempt);
         void updateStatus(std::string status);
@@ -59,5 +61,4 @@ class LayoutJoin : public Layout {
         Field _fCancel;
         uint8_t _band;
 };
-
 #endif
diff --git a/Layout/LayoutSurveyGps.cpp b/Layout/LayoutSurveyGps.cpp
new file mode 100644
index 0000000..2630566
--- /dev/null
+++ b/Layout/LayoutSurveyGps.cpp
@@ -0,0 +1,166 @@
+/* Copyright (c) <2016> <MultiTech Systems>, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "LayoutSurveyGps.h"
+LayoutSurveyGps::LayoutSurveyGps(DOGS102* lcd, uint8_t band)
+    : Layout(lcd),
+      _band(band),
+      _lDR(8,0,"DR"),
+      _lFSB(0,0,"FSB"),
+      _lTemp(8,6,"Temp "),
+      _lPower(13,0,"P"),
+      _lPadding(0,6,"Pad"),
+      _fDr(10,0,2),
+      _fSw1(13,7,4),
+      _fSw2(0,7,9),
+      _fFSB(3,0,1),
+      _fTemp(13,6,4),
+      _fPower(14,0,2),
+      _fNoLink(0,1,17),
+      _fGpsLat(0,3,17),
+      _fGpsLon(0,4,17),
+      _fGpsTime(0,5,17),
+      _fDownSnr(12,2,5),
+      _fPadding(4,6,3),
+      _fDownRssi(0,2,12)
+{}
+
+LayoutSurveyGps::~LayoutSurveyGps() {}
+
+void LayoutSurveyGps::display() {}
+
+void LayoutSurveyGps::initial(){
+    writeField(_fNoLink, string("                 "), true);
+}
+
+void LayoutSurveyGps::display(bool success, mDot::snr_stats snr, mDot::rssi_stats rssi, int power, int fsb, int padding, int dr){
+    char buf[17];
+    size_t size;
+    clear();
+    startUpdate();
+    writeLabel(_lDR);
+    writeLabel(_lTemp);
+    writeLabel(_lPower);
+    writeLabel(_lPadding);
+     
+    if (_band == mDot::FB_915) {
+        writeLabel(_lFSB);
+    }
+    if(success) {
+        size = snprintf(buf, sizeof(buf), "DWN %3d dbm", rssi.last);
+        writeField(_fDownRssi, buf, size);
+
+        memset(buf, 0, sizeof(buf));
+        size = snprintf(buf, sizeof(buf), " %2.1f", snr.last / 10.0);
+        writeField(_fDownSnr, buf, size);
+    } else {
+        writeField(_fNoLink,string("Send Failed"),true);
+        }
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%d", dr);
+    writeField(_fDr, buf, size, true);
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%d", power);
+    writeField(_fPower, buf, size, true);
+    
+    if (_band == mDot::FB_915) {
+        memset(buf, 0, sizeof(buf));
+        size = snprintf(buf, sizeof(buf), "%d", fsb);
+        writeField(_fFSB, buf, size, true);
+    }
+    
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%d", padding);
+    writeField(_fPadding, buf, size, true);
+    endUpdate();
+}
+
+void LayoutSurveyGps::updateSw1(string Sw1, string Sw2){
+    string temp;
+    for(int i = Sw1.size(); i<4; i++){
+         temp+=" ";
+    }
+    temp+=Sw1;
+    writeField(_fSw1, temp, true);
+}
+
+void LayoutSurveyGps::updateSw2(string Sw2){
+    writeField(_fSw2, Sw2, true);
+}
+
+void LayoutSurveyGps::sending(){
+    clear();
+    writeField(_fGpsLat,string("   Sending..."),true);
+}
+
+void LayoutSurveyGps::sendResult(string str){
+    clear();
+    writeField(_fGpsLat,str,true);
+}
+
+void LayoutSurveyGps::updateNextCh(int count_down){
+    clear();
+    size_t size;
+    char buf[17];
+    size = snprintf(buf, sizeof(buf), "Countdown:%d", count_down);
+    writeField(_fGpsTime, buf, size, true);
+    writeField(_fGpsLon, string("No Free Channel"), true);
+}
+
+void LayoutSurveyGps::updateStats(bool GPS, GPSPARSER::longitude lon, GPSPARSER::latitude lat, struct tm time, float temp){
+    char buf[17];
+    size_t size;
+    startUpdate();
+
+    if(GPS) {
+        size = snprintf(buf, sizeof(buf), "%d %d %d.%03d %c",
+                        abs(lon.degrees),
+                        lon.minutes,
+                        (lon.seconds * 6) / 1000,
+                        (lon.seconds * 6) % 1000,
+                        (lon.degrees > 0) ? 'E' : 'W');
+        writeField(_fGpsLon, buf, size, true);
+
+        memset(buf, 0, sizeof(buf));
+        size = snprintf(buf, sizeof(buf), "%d %d %d.%03d %c",
+                        abs(lat.degrees),
+                        lat.minutes,
+                        (lat.seconds * 6) / 1000,
+                        (lat.seconds * 6) % 1000,
+                        (lat.degrees > 0) ? 'N' : 'S');
+        writeField(_fGpsLat, buf, size, true);
+
+        memset(buf, 0, sizeof(buf));
+        size = snprintf(buf, sizeof(buf), "%02d:%02d %02d/%02d/%04d",
+                        time.tm_hour,
+                        time.tm_min,
+                        time.tm_mon + 1,
+                        time.tm_mday,
+                        time.tm_year + 1900);
+        writeField(_fGpsTime, buf, size, true);
+
+    } else {
+         writeField(_fGpsLon, string("No Gps Lock"), true);
+    }
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%.1f", temp);
+    writeField(_fTemp, buf, size, true);
+    endUpdate();
+}
diff --git a/Layout/LayoutSurveyGps.h b/Layout/LayoutSurveyGps.h
new file mode 100644
index 0000000..9e3194f
--- /dev/null
+++ b/Layout/LayoutSurveyGps.h
@@ -0,0 +1,65 @@
+/* Copyright (c) <2016> <MultiTech Systems>, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LAYOUTSURVEYGPS_H__
+#define __LAYOUTSURVEYGPS_H__
+
+#include "Layout.h"
+#include "GPSPARSER.h"
+#include "mDot.h"
+
+class LayoutSurveyGps : public Layout{
+public:
+    LayoutSurveyGps(DOGS102* lcd, uint8_t band);
+    ~LayoutSurveyGps();
+
+    void display();
+    void display(bool success, mDot::snr_stats snr, mDot::rssi_stats rssi,int power, int fsb, int padding, int dr);
+
+    void sending();
+    void initial();
+    void updateSw2(string str);
+    void sendResult(string str);
+    void updateNextCh(int count_down);
+    void updateSw1(string Sw1, string Sw2);
+    void updateStats(bool GPS, GPSPARSER::longitude lon, GPSPARSER::latitude lat, struct tm time, float temp);
+
+private:
+    uint8_t _band;
+
+    Label _lDR;
+    Label _lFSB;
+    Label _lTemp;
+    Label _lPower;
+    Label _lPadding;
+
+    Field _fDr;
+    Field _fSw1;
+    Field _fSw2;
+    Field _fFSB;
+    Field _fTemp;
+    Field _fPower;
+    Field _fNoLink;
+    Field _fGpsLat;
+    Field _fGpsLon;
+    Field _fGpsTime;
+    Field _fDownSnr;
+    Field _fPadding;
+    Field _fDownRssi;
+};
+#endif
diff --git a/LoRaHandler/LoRaHandler.cpp b/LoRaHandler/LoRaHandler.cpp
index de9f0b1..d52ca54 100644
--- a/LoRaHandler/LoRaHandler.cpp
+++ b/LoRaHandler/LoRaHandler.cpp
@@ -87,12 +87,16 @@ void l_worker(void const* argument) {
                     l->_mutex.unlock();
                     if (ret == mDot::MDOT_OK) {
                         l->_status = LoRaHandler::join_success;
+                        osSignalSet(l->_main, loraSignal);
+                        l->_tick.detach();
+                        l->_activity_led = LoRaHandler::green;
                     } else {
                         l->_status = LoRaHandler::join_failure;
+                        osSignalSet(l->_main, loraSignal);
+                        l->_tick.detach();
+                        l->_activity_led = LoRaHandler::red;
                     }
-                    osSignalSet(l->_main, loraSignal);
-                    l->_tick.detach();
-                    l->_activity_led = LoRaHandler::green;
+                
                     break;
 
                 default:
@@ -180,3 +184,4 @@ void LoRaHandler::resetActivityLed() {
     _activity_led = red;
 }
 
+
diff --git a/Mode/ModeGps.cpp b/Mode/ModeGps.cpp
new file mode 100644
index 0000000..d97e77e
--- /dev/null
+++ b/Mode/ModeGps.cpp
@@ -0,0 +1,356 @@
+/* Copyright (c) <2016> <MultiTech Systems>, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "ModeGps.h"
+#include "MTSLog.h"
+#include "rtos.h"
+#include "mbed.h"
+#include "limits.h"
+#define PACKETSIZE 11
+
+ModeGps::ModeGps(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora, GPSPARSER* gps, SensorHandler* sensors, ModeJoin* join)
+    : Mode(lcd, buttons, dot, lora, gps, sensors),
+      _help(lcd),
+      _sem(lcd, _band),
+      _sem_join(lcd, _band),
+      _join(join)
+{}
+
+string ModeGps::intToString(int num){
+   char buf[3];
+   snprintf(buf, sizeof(buf), "%d", num);
+   return buf;
+}
+
+void ModeGps::init(){
+    //resets all parameters when re-entering mode 
+    _interval = 5;
+    _padding = 0;
+    _power = 20;
+    _band = _dot->getFrequencyBand(); 
+    _parameter = POWER;
+    _drAll = false;
+    _link_check = false;
+    _GPS = false;
+    _sub_band = _dot->getFrequencySubBand();
+    _data_rate = mDot::DR0;
+    _max_padding = _dot->getMaxPacketLength() - PACKETSIZE;
+    _Sw2 = "Power";
+    _Sw1 = intToString(_power);
+    _help.display();
+    osDelay(2000);
+    
+    if(_band == mDot::FB_868){
+         _sem.display(_link_check, _snr, _rssi, _power, _sub_band, _padding, _data_rate);
+         _sem.initial();
+         _state = PARAMETERS;
+         _send_timer.start();
+     } else { _state = BAND_CHANGE;
+          _sem_join.displayEditFsb(_data_rate, _power, _sub_band, _dot->getNetworkName(), _dot->getNetworkPassphrase());
+     }
+}
+
+void ModeGps::drIncrement(){
+    _data_rate++;
+    if (_data_rate > mDot::DR3 && _band == mDot::FB_915 || _data_rate > mDot::DR5) {
+        _drAll = true;
+        _data_rate = 0;
+    }
+    _dot->setTxDataRate(_data_rate);
+    logInfo("new data rate %s, POWER %lu", mDot::DataRateStr(_data_rate).c_str(), _power);
+    _max_padding = _dot->getMaxPacketLength() - PACKETSIZE;
+}
+
+void ModeGps::changeDataRate(){
+    if(_drAll) {
+        _data_rate = -1;
+        _drAll = false;
+    }
+    drIncrement();
+}
+
+void ModeGps::changeParameter(){
+    _parameter++;
+    if(_band==mDot::FB_868&&_parameter==FSB){
+        _parameter++;
+    }
+    if(_parameter>INTERVAL){
+    _parameter = 0;
+    }
+    switch(_parameter) {
+        case DATA_RATE:
+            _Sw2 = "Data Rate";
+            _Sw1 = intToString(_data_rate);
+            if(_drAll){
+                _Sw1 = "All";
+            }
+            break;
+        case FSB:
+            _Sw2 = "FSB";
+            _Sw1 = intToString(_sub_band);
+            break;
+        case PADDING:
+            _Sw2 = "Padding";
+            _Sw1 = intToString(_padding);
+            break;
+        case POWER:
+            _Sw2 = "Power";
+            _Sw1 = intToString(_power);
+            break;
+        case INTERVAL:
+            _Sw2 = "Interval";
+            _Sw1 = intToString(_interval);
+            break;
+        default:
+            break;
+    }
+}
+
+void ModeGps::editParameter(){
+    switch(_parameter) {
+        case POWER:
+            if(_power<20){
+                _power+=3;
+            } else {
+                _power = 2;
+            }
+            _Sw1 = intToString(_power);
+            _dot->setTxPower(_power);
+            break;
+            
+        case DATA_RATE:
+            changeDataRate();
+            if(_drAll) {
+                _Sw1="All";
+            } else {
+                _Sw1 = intToString(_data_rate);
+            }
+            break;
+
+        case FSB:
+            _send_timer.stop();
+            _send_timer.reset();
+            _state = BAND_CHANGE;
+            _dot->resetNetworkSession();
+            _lora->resetActivityLed();
+            _sem_join.displayEditFsb(mDot::DR0, 20, _sub_band, _dot->getNetworkName(), _dot->getNetworkPassphrase());
+            break;
+
+        case PADDING:
+            if(_padding<_max_padding){
+                _padding += 10 - (_padding % 10);
+            } else {
+                 _padding = 0;
+            }
+            if(_padding>_max_padding){
+                _padding = _max_padding;
+            }
+            _Sw1 = intToString(_padding);
+            break;
+
+        default:
+            if(_interval<60){
+                _interval += 5;
+            } else {
+                _interval = 5;
+            }
+            _Sw1 = intToString(_interval);
+            break;
+    }
+}
+
+void ModeGps::formatData(){
+    _send_data.clear();
+    uint32_t lat = 0;
+    uint32_t lng = 0;
+    double degrees = 0;
+    double minutes = 0;
+    double seconds = 0;
+    _temp_C += 0.5;
+
+    if(_GPS) {
+        degrees = _latitude.degrees;
+        minutes = _latitude.minutes;
+        seconds = _latitude.seconds;
+        if(degrees<0) {
+              lat = ~(int)((degrees - minutes/60.0 - seconds/600000.0)*(-INT_MAX/90.0 + 1.5));
+        } else {
+            lat =  (int)((degrees + minutes/60.0 + seconds/600000.0)*(INT_MAX/90.0 + 0.5));
+            }
+        degrees = _longitude.degrees;
+        minutes = _longitude.minutes;
+        seconds = _longitude.seconds;
+        if(degrees<0) {
+             lng = ~(int)((degrees - minutes/60.0 - seconds/600000.0)*(-INT_MAX/180.0 + 1.5));
+        } else { 
+        lng =  (int)((degrees + minutes/60.0 + seconds/600000.0)*(INT_MAX/180.0 + 0.5));
+        }
+    }
+    _send_data.push_back(0);
+    _send_data.push_back((int8_t) _temp_C);
+    _send_data.push_back(0);
+    for(int i=24; i>=0; i-=8){
+        _send_data.push_back((lat>>i)&0xFF);
+    }
+    for(int i=24; i>=0; i-=8){
+        _send_data.push_back((lng>>i)&0xFF);
+    }
+    for(int i=0; i<(_padding>_max_padding ? _max_padding:_padding); i++){
+         _send_data.push_back(0);
+    }
+}
+
+void ModeGps::setBand(){
+    _sub_band++;
+    if(_sub_band > mDot::FSB_8) _sub_band = mDot::FSB_ALL;
+    _dot->setFrequencySubBand(_sub_band);
+}
+
+void ModeGps::updateScreen(){
+    _temp_C = _sensors->getTemp(SensorHandler::CELSIUS);
+    if(_gps->getLockStatus() && _gps_available) {
+        _GPS = true;
+        _latitude = _gps->getLatitude();
+        _longitude = _gps->getLongitude();
+        _time = _gps->getTimestamp();
+    } else {
+         _GPS = false;
+    }
+    _sem.updateStats( _GPS, _longitude, _latitude, _time, _temp_C);
+    _sem.updateSw1(_Sw1, _Sw2);
+    _sem.updateSw2(_Sw2);
+}
+
+void ModeGps::send(){   
+    _state = SENDING;
+    _send_timer.stop();
+    if(_band==mDot::FB_868) {
+        while(_dot->getNextTxMs()>0) {
+            _sem.updateNextCh((int)(_dot->getNextTxMs()/1000));
+            osDelay(250);
+        }
+    }
+    formatData();
+    _sem.sending();
+    _send_timer.reset();
+    _send_timer.start();
+    _lora->send(_send_data);
+    osDelay(500);
+}
+
+bool ModeGps::start(){
+    init();
+    _button_timer.start();
+    ButtonHandler::ButtonEvent be;
+    osSignalClear(_main_id, buttonSignal | loraSignal);
+    while (true) {
+        if(_state==PARAMETERS){
+            updateScreen();
+        }
+        osEvent e = Thread::signal_wait(0, 250);
+        if (e.status == osEventSignal) {
+            if (e.value.signals & buttonSignal) {
+                _button_timer.reset();
+                be = _buttons->getButtonEvent();
+
+                switch(be) {
+                    case ButtonHandler::sw1_press:
+                        switch(_state) {
+                            case BAND_CHANGE:
+                                setBand();
+                                _sem_join.updateJoinFsb(_sub_band);
+                                break;
+                                
+                            case PARAMETERS:
+                                editParameter();
+                                break;
+                                
+                            default:
+                                break;
+                        }
+                        break;
+                    case ButtonHandler::sw2_press:
+                        switch(_state) {
+                            case BAND_CHANGE:
+                                if(_join->start()){
+                                    _state = PARAMETERS;
+                                    _send_timer.start();
+                                    _sem.display(_link_check, _snr, _rssi, _power, _sub_band, _padding, DATA_RATE);
+                                    _sem.initial();
+                                    _dot->setTxDataRate(_data_rate);
+                                } else _sem_join.displayEditFsb(mDot::DR0, 20, _sub_band, _dot->getNetworkName(), _dot->getNetworkPassphrase());
+                                break;
+                                
+                            case PARAMETERS:
+                                changeParameter();
+                                break;
+                                
+                            default:
+                                break;
+                        }
+                        break;
+                        
+                    case ButtonHandler::sw1_hold:
+                        _send_timer.stop();
+                        _send_timer.reset();
+                        return true;
+
+                    default:
+                        break;
+                }
+            }
+        }
+        if (e.value.signals & loraSignal) {
+            _ls = _lora->getStatus();
+            switch (_ls) {
+
+                case LoRaHandler::send_success:
+                    _sem.sendResult("   Send Sucess!");
+                    osDelay(500);
+                    _link_check = true;
+                    _snr = _dot->getSnrStats();
+                    _rssi = _dot->getRssiStats();
+                    _button_timer.reset();
+                    _state = PARAMETERS;
+                    _sem.display(_link_check, _snr, _rssi, _power, _sub_band, _padding, _data_rate);
+                    if(_drAll){
+                        drIncrement();
+                    }
+                    break;
+
+                case LoRaHandler::send_failure:
+                    _sem.sendResult("   Send Failed.");
+                    osDelay(500);
+                    _link_check = false;
+                    _button_timer.reset();
+                    _state = PARAMETERS;
+                    _sem.display(_link_check, _snr, _rssi, _power, _sub_band, _padding, _data_rate);
+                     if(_drAll){
+                        drIncrement();
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        if(_send_timer.read_ms() > _interval*1000 && _button_timer.read_ms() > 3000){
+             send();
+        }
+    }
+}
diff --git a/Mode/ModeGps.h b/Mode/ModeGps.h
new file mode 100644
index 0000000..39b64ff
--- /dev/null
+++ b/Mode/ModeGps.h
@@ -0,0 +1,77 @@
+/* Copyright (c) <2016> <MultiTech Systems>, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __MODEGPS_H__
+#define __MODEGPS_H__
+
+#include "Mode.h"
+#include "ModeJoin.h"
+#include "LayoutHelp.h"
+#include "LayoutSurveyGps.h"
+
+class ModeGps : public Mode{
+public:
+    ModeGps(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora, GPSPARSER* gps, SensorHandler* sensors, ModeJoin* join);
+    ~ModeGps();
+    bool start();
+
+private:
+    enum {DATA_RATE,
+          FSB, 
+          PADDING, 
+          POWER, 
+          INTERVAL
+          };
+    enum {BAND_CHANGE, 
+          SENDING, 
+          PARAMETERS
+          };
+          
+    LayoutHelp _help;
+    LayoutSurveyGps _sem;
+    LayoutJoin _sem_join;
+
+    ModeJoin* _join;
+
+    Timer _send_timer, _button_timer;
+
+    float _temp_C;
+    std::vector<uint8_t> _send_data;
+    uint8_t _parameter, _padding, _interval, _max_padding;
+    bool _drAll, _link_check, _GPS;
+    string _Sw1, _Sw2;
+
+    struct tm _time;
+    mDot::snr_stats _snr;
+    mDot::rssi_stats _rssi;
+    GPSPARSER::latitude  _latitude;
+    GPSPARSER::longitude _longitude;
+
+    void init();
+    void send();
+    void setBand();
+    void sendData();
+    void formatData();
+    void drIncrement();
+    void updateScreen();
+    void editParameter();
+    void changeDataRate();
+    void changeParameter();
+    string intToString(int num);
+};
+#endif
\ No newline at end of file
diff --git a/Mode/ModeJoin.cpp b/Mode/ModeJoin.cpp
index 5618eca..239eadb 100644
--- a/Mode/ModeJoin.cpp
+++ b/Mode/ModeJoin.cpp
@@ -42,7 +42,7 @@ bool ModeJoin::start() {
     _initial_data_rate = _dot->getTxDataRate();
     _initial_power = _dot->getTxPower();
 
-    _data_rate = (_band == mDot::FB_915) ? mDot::SF_10 : mDot::SF_12;
+    _data_rate = mDot::DR0;
     _power = 20;
     _joined = false;
 
@@ -123,9 +123,7 @@ void ModeJoin::display() {
         _sub_band = _dot->getFrequencySubBand();
         _join.updateFsb(_sub_band);
     }
-    // mDot::DataRateStr returns format SF_XX - we only want to display the XX part
-    _join.updateRate(_dot->DataRateStr(_data_rate).substr(3));
+    _join.updateRate(_dot->getTxDataRate());
     _join.updatePower(_power);
     _join.updateAttempt(_lora->getJoinAttempts());
-}
-
+}
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 3a35c8f..f1276f6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -41,6 +41,7 @@
 #include "ModeSweep.h"
 #include "ModeDemo.h"
 #include "ModeConfig.h"
+#include "ModeGps.h"
 #include "ModeData.h"
 // misc heders
 #include "FileName.h"
@@ -61,7 +62,7 @@ osThreadId main_id;
 ButtonHandler* buttons;
 
 // LoRa controller
-LoRaHandler* lora;
+LoRaHandler* lora_handler;
 mDot* dot;
 
 // GPS
@@ -77,6 +78,7 @@ ModeSingle* modeSingle;
 ModeSweep* modeSweep;
 ModeDemo* modeDemo;
 ModeConfig* modeConfig;
+ModeGps* modeGps;
 ModeData* modeData;
 
 // Serial debug port
@@ -100,7 +102,7 @@ int main() {
     main_id = Thread::gettid();
     buttons = new ButtonHandler(main_id);
     dot = mDot::getInstance();
-    lora = new LoRaHandler(main_id);
+    lora_handler = new LoRaHandler(main_id);
     gps = new GPSPARSER(&gps_serial, led_cont);
     sensors = new SensorHandler();
 
@@ -108,12 +110,13 @@ int main() {
 
     MTSLog::setLogLevel(MTSLog::TRACE_LEVEL);
 
-    modeJoin = new ModeJoin(lcd, buttons, dot, lora, gps, sensors);
-    modeSingle = new ModeSingle(lcd, buttons, dot, lora, gps, sensors);
-    modeSweep = new ModeSweep(lcd, buttons, dot, lora, gps, sensors);
-    modeDemo = new ModeDemo(lcd, buttons, dot, lora, gps, sensors);
-    modeConfig = new ModeConfig(lcd, buttons, dot, lora, gps, sensors);
-    modeData = new ModeData(lcd, buttons, dot, lora, gps, sensors);
+    modeJoin = new ModeJoin(lcd, buttons, dot, lora_handler, gps, sensors);
+    modeSingle = new ModeSingle(lcd, buttons, dot, lora_handler, gps, sensors);
+    modeSweep = new ModeSweep(lcd, buttons, dot, lora_handler, gps, sensors);
+    modeDemo = new ModeDemo(lcd, buttons, dot, lora_handler, gps, sensors);
+    modeConfig = new ModeConfig(lcd, buttons, dot, lora_handler, gps, sensors);
+    modeGps = new ModeGps(lcd, buttons, dot, lora_handler, gps, sensors, modeJoin);
+    modeData = new ModeData(lcd, buttons, dot, lora_handler, gps, sensors);
 
     osDelay(1000);
     logInfo("%sGPS detected", gps->gpsDetected() ? "" : "no ");
@@ -140,6 +143,7 @@ void mainMenu() {
         config,
         single,
         sweep,
+        gps,
         data
     } menu_items;
 
@@ -149,14 +153,15 @@ void mainMenu() {
         "Configuration",
         "Survey Single",
         "Survey Sweep",
+        "Survey Gps",
         "Survey Data"
     };
-
     std::vector<std::string> items;
     items.push_back(menu_strings[demo]);
     items.push_back(menu_strings[config]);
     items.push_back(menu_strings[single]);
     items.push_back(menu_strings[sweep]);
+    items.push_back(menu_strings[gps]);
     items.push_back(menu_strings[data]);
 
     while (true) {
@@ -165,7 +170,7 @@ void mainMenu() {
 
         // reset session between modes
         dot->resetNetworkSession();
-        lora->resetActivityLed();
+        lora_handler->resetActivityLed();
         LayoutScrollSelect menu(lcd, items, product, menu_strings[0]);
         menu.display();
 
@@ -188,7 +193,6 @@ void mainMenu() {
                 }
             }
         }
-
         if (selected == menu_strings[demo]) {
             if (modeJoin->start())
                 modeDemo->start();
@@ -200,7 +204,10 @@ void mainMenu() {
         } else if (selected == menu_strings[sweep]) {
             if (modeJoin->start())
                 modeSweep->start();
-        }else if (selected == menu_strings[data]) {
+        } else if (selected == menu_strings[gps]) {
+            if(dot->getFrequencyBand()==mDot::FB_868)modeJoin->start();
+                modeGps->start();
+        } else if (selected == menu_strings[data]) {
             modeData->start();
         } 
 
@@ -208,4 +215,3 @@ void mainMenu() {
     }
 }
 
-