Diff: Layout/LayoutJoin.cpp

Revision:

7:a31236c2e75c

Parent:

1:71125aa00e33

Child:

12:671b15182260

--- a/Layout/LayoutJoin.cpp	Fri Nov 04 22:21:01 2016 +0000
+++ b/Layout/LayoutJoin.cpp	Fri Nov 04 17:27:05 2016 -0500
@@ -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, 
@@ -47,7 +47,7 @@
 
     writeLabel(_lId);
     writeLabel(_lKey);
-    if (_band == mDot::FB_915) {
+    if (_band == mDot::FB_US915 || _band == mDot::FB_AU915) {
         writeLabel(_lFsb);
     }
     writeLabel(_lRate);
@@ -75,8 +75,12 @@
     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 @@
     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();  
+}