Replace LayoutSemtechJoin.h

1 files changed, 43 insertions, 62 deletions

diff --git a/Layout/LayoutSemtechJoin.h b/Layout/LayoutSemtechJoin.h
index dd62fd6..f848334 100644
--- a/Layout/LayoutSemtechJoin.h
+++ b/Layout/LayoutSemtechJoin.h
@@ -1,78 +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
+ * 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
+ * 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,
+ * 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__
+#ifndef __LAYOUTSEMTECHJOIN_H__
+#define __LAYOUTSEMTECHJOIN_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;
+#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
 
 
-
-
-