Merge branch 'Semtech'

Conflicts:
	.gitmodules
	Mode/ModeJoin.cpp
	main.cpp

Add AU915

4 files changed, 428 insertions, 0 deletions

diff --git a/Layout/LayoutSemtech.cpp b/Layout/LayoutSemtech.cpp
new file mode 100644
index 0000000..e31d149
--- /dev/null
+++ b/Layout/LayoutSemtech.cpp
@@ -0,0 +1,200 @@
+/* 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 "LayoutSemtech.h"
+
+
+LayoutSemtech::LayoutSemtech(DOGS102* lcd, uint8_t band)
+    : Layout(lcd),
+      _band(band),
+      _lDr(8,0,"DR"),
+      _lFSB(0,0,"FSB"),
+      _lSend(3,3,"Sending..."),
+      _lTemp(8,6,"Temp "),
+      _lNoGps(0,4,"No Gps Lock"),
+      _lPower(13,0,"P"),
+      _lBlank(0,1,"                 "),
+      _lNoLink(0,1,"Send Failed"),
+      _lPadding(0,6,"Pad"),
+      _lNoChannel(0,3,"No Free Channel"),
+      _fDr(10,0,2),
+      _fSw1(13,7,4),
+      _fSw2(0,7,9),
+      _fFSB(3,0,1),
+      _fTemp(13,6,4),
+      _fPower(14,0,2),
+      _fNextCh(0,5,17),
+      _fGpsLat(0,3,17),
+      _fGpsLon(0,4,17),
+      _fResult(3,3,16),
+      _fGpsTime(0,5,16),
+      _fDownSnr(12,2,5),
+      _fPadding(4,6,3),
+      _fDownRssi(0,2,11)
+{}
+
+LayoutSemtech::~LayoutSemtech() {}
+
+void LayoutSemtech::display() {}
+
+void LayoutSemtech::initial() 
+{
+    writeLabel(_lBlank);
+}
+
+void LayoutSemtech::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", (float)snr.last / 10.0);
+        writeField(_fDownSnr, buf, size);
+    } else writeLabel(_lNoLink);
+
+    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 LayoutSemtech::updateSw1(string Sw1, string Sw2, int dr, int power, int padding)
+{
+    size_t size;
+    char buf[17];
+    string temp;
+    for(int i = Sw1.size(); i<4; i++) temp+=" ";
+    temp+=Sw1;
+    writeField(_fSw1, temp, true);
+    startUpdate();
+    if(Sw2=="Data Rate") {
+        memset(buf, 0, sizeof(buf));
+        size = snprintf(buf, sizeof(buf), "%d",dr);
+        writeField(_fDr, buf, size, true);
+    } else if(Sw2=="Power") {
+        memset(buf, 0, sizeof(buf));
+        size = snprintf(buf, sizeof(buf), "%d",power);
+        writeField(_fPower, buf, size, true);
+    } else if(Sw2=="Padding") {
+        memset(buf, 0, sizeof(buf));
+        size = snprintf(buf, sizeof(buf), "%d",padding);
+        writeField(_fPadding, buf, size, true);
+    }
+    endUpdate();
+}
+
+void LayoutSemtech::updateSw2(string Sw2)
+{
+    writeField(_fSw2, Sw2, true);
+}
+
+void LayoutSemtech::sending()
+{
+    clear();
+    writeLabel(_lSend);
+}
+
+void LayoutSemtech::sendResult(string str)
+{
+    clear();
+    writeField(_fResult,str,true);
+}
+
+
+void LayoutSemtech::updateNextCh(int count_down)
+{
+    clear();
+    size_t size;
+    char buf[17];
+    size = snprintf(buf, sizeof(buf), "Countdown:%d",count_down);
+    writeField(_fNextCh, buf, size, true);
+    writeLabel(_lNoChannel);
+}
+
+void LayoutSemtech::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  writeLabel(_lNoGps);
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%.1f",temp);
+    writeField(_fTemp, buf, size, true);
+
+    endUpdate();
+}
+
diff --git a/Layout/LayoutSemtech.h b/Layout/LayoutSemtech.h
new file mode 100644
index 0000000..dd62fd6
--- /dev/null
+++ b/Layout/LayoutSemtech.h
@@ -0,0 +1,78 @@
+/* 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 __LAYOUTSEMTECH_H__
+#define __LAYOUTSEMTECH_H__
+
+#include "Layout.h"
+#include "GPSPARSER.h"
+#include "LoRaHandler.h"
+
+class LayoutSemtech : public Layout
+{
+public:
+    LayoutSemtech(DOGS102* lcd, uint8_t band);
+    ~LayoutSemtech();
+
+    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, int dr, int power, int padding);
+    void updateStats(bool GPS, GPSPARSER::longitude lon, GPSPARSER::latitude lat, struct tm time, float temp);
+
+private:
+    uint8_t _band;
+
+    Label _lDr;
+    Label _lFSB;
+    Label _lSend;
+    Label _lTemp;
+    Label _lNoGps;
+    Label _lPower;
+    Label _lBlank;
+    Label _lNoLink;
+    Label _lPadding;
+    Label _lNoChannel;
+
+    Field _fDr;
+    Field _fSw1;
+    Field _fSw2;
+    Field _fFSB;
+    Field _fTemp;
+    Field _fPower;
+    Field _fNextCh;
+    Field _fGpsLat;
+    Field _fGpsLon;
+    Field _fResult;
+    Field _fGpsTime;
+    Field _fDownSnr;
+    Field _fPadding;
+    Field _fDownRssi;
+};
+
+#endif
+
+
+
+
+
diff --git a/Layout/LayoutSemtechJoin.cpp b/Layout/LayoutSemtechJoin.cpp
new file mode 100644
index 0000000..7bb7ac0
--- /dev/null
+++ b/Layout/LayoutSemtechJoin.cpp
@@ -0,0 +1,91 @@
+/* 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 "LayoutSemtechJoin.h"
+
+LayoutSemtechJoin::LayoutSemtechJoin(DOGS102* lcd, uint8_t band)
+    : Layout(lcd),
+      _band(band),
+      _lId(0, 1, "NI="),
+      _lKey(0, 2, "NK="),
+      _lFsb(0, 3, "FSB="),
+      _lRate(0, 5, "DR="),
+      _lPower(6, 5, "P="),
+      _lJoin(0, 7, "Join"),
+      _fId(3, 1, 14),
+      _fKey(3, 2, 14),
+      _fFsb(4, 3, 2),
+      _fRate(3, 5, 2),
+      _fPower(8, 5, 2),
+      _fStatus(0, 0, 17),
+      _fSubBand(16,7,1)
+{}
+
+LayoutSemtechJoin::~LayoutSemtechJoin() {}
+
+void LayoutSemtechJoin::display()
+{
+    clear();
+    startUpdate();
+
+    writeLabel(_lId);
+    writeLabel(_lKey);
+    if (_band == mDot::FB_915) {
+        writeLabel(_lFsb);
+    }
+    writeLabel(_lRate);
+    writeLabel(_lPower);
+    writeLabel(_lJoin);
+    
+    endUpdate();
+}
+
+void LayoutSemtechJoin::updateId(std::string id)
+{
+    writeField(_fId, id, true);
+}
+
+void LayoutSemtechJoin::updateKey(std::string key)
+{
+    writeField(_fKey, key, true);
+}
+
+void LayoutSemtechJoin::updateFsb(uint8_t band)
+{
+    if (_band == mDot::FB_915) {
+    char buf[8];
+    size_t size;
+    size = snprintf(buf, sizeof(buf), "%u", band);
+    writeField(_fFsb, buf, size, true);
+    writeField(_fSubBand, buf, size, true);
+    }
+}
+
+void LayoutSemtechJoin::updateRate(std::string rate)
+{
+    writeField(_fRate, rate, true);
+}
+
+void LayoutSemtechJoin::updatePower(uint32_t power)
+{
+    char buf[16];
+    size_t size;
+
+    size = snprintf(buf, sizeof(buf), "%lu", power);
+    writeField(_fPower, buf, size, true);
+}
diff --git a/Layout/LayoutSemtechJoin.h b/Layout/LayoutSemtechJoin.h
new file mode 100644
index 0000000..f848334
--- /dev/null
+++ b/Layout/LayoutSemtechJoin.h
@@ -0,0 +1,59 @@
+/* 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 __LAYOUTSEMTECHJOIN_H__
+#define __LAYOUTSEMTECHJOIN_H__
+
+#include "Layout.h"
+#include "mDot.h"
+
+class LayoutSemtechJoin : public Layout {
+    public:
+        LayoutSemtechJoin(DOGS102* lcd, uint8_t band);
+        ~LayoutSemtechJoin();
+
+        void display();
+
+        void updateId(std::string id);
+        void updateKey(std::string key);
+        void updateFsb(uint8_t band);
+        void updateRate(std::string rate);
+        void updatePower(uint32_t power);
+
+    private:
+        uint8_t _band;
+    
+        Label _lId;
+        Label _lKey;
+        Label _lFsb;
+        Label _lRate;
+        Label _lPower;
+        Label _lJoin;
+        
+        Field _fId;
+        Field _fKey;
+        Field _fFsb;
+        Field _fRate;
+        Field _fPower;
+        Field _fStatus;
+        Field _fSubBand;
+};
+
+#endif
+
+