summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Fiore <mfiore@multitech.com>2016-01-08 10:05:28 -0600
committerMike Fiore <mfiore@multitech.com>2016-01-08 10:05:28 -0600
commit52bc86ff4e20e155cfa2411225b3f8c81c769cd1 (patch)
tree5cd90f30bf1899ef4c7c78420557924b667df350
parent1d6bcd0116b9082f42035da8bb2be1868eb12dee (diff)
downloadmtdot-box-evb-factory-firmware-52bc86ff4e20e155cfa2411225b3f8c81c769cd1.tar.gz
mtdot-box-evb-factory-firmware-52bc86ff4e20e155cfa2411225b3f8c81c769cd1.tar.bz2
mtdot-box-evb-factory-firmware-52bc86ff4e20e155cfa2411225b3f8c81c769cd1.zip
display frequency band (868 or 915) on splash screen and main menu
-rw-r--r--Layout/LayoutStartup.cpp2
-rw-r--r--Layout/LayoutStartup.h1
-rw-r--r--main.cpp5
3 files changed, 7 insertions, 1 deletions
diff --git a/Layout/LayoutStartup.cpp b/Layout/LayoutStartup.cpp
index 570761e..56949aa 100644
--- a/Layout/LayoutStartup.cpp
+++ b/Layout/LayoutStartup.cpp
@@ -9,6 +9,7 @@ LayoutStartup::LayoutStartup(DOGS102* lcd, mDot* dot)
_lName(0, 3, "MTDOT-BOX/EVB"),
_lInfo(0, 4, "Factory Firmware"),
_lVersion(0, 5, "Version"),
+ _fName(14, 3, 3),
_fVersion(8, 5, 9),
_fId(0, 7, 17),
_fGps(0, 6, 17),
@@ -28,6 +29,7 @@ void LayoutStartup::display() {
writeLabel(_lName);
writeLabel(_lInfo);
writeLabel(_lVersion);
+ writeField(_fName, mDot::FrequencyBandStr(_dot->getFrequencyBand()).substr(3));
writeField(_fVersion, version);
writeField(_fId, id);
diff --git a/Layout/LayoutStartup.h b/Layout/LayoutStartup.h
index 4490887..f9cdbbd 100644
--- a/Layout/LayoutStartup.h
+++ b/Layout/LayoutStartup.h
@@ -19,6 +19,7 @@ class LayoutStartup : public Layout {
Label _lInfo;
Label _lVersion;
+ Field _fName;
Field _fVersion;
Field _fGps;
Field _fId;
diff --git a/main.cpp b/main.cpp
index 340f567..b22def3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -112,6 +112,9 @@ int main() {
void mainMenu() {
bool mode_selected = false;
std::string selected;
+ std::string product = "MTDOT-BOX/EVB ";
+
+ product += mDot::FrequencyBandStr(dot->getFrequencyBand()).substr(3);
typedef enum {
demo = 2,
@@ -121,7 +124,7 @@ void mainMenu() {
} menu_items;
std::string menu_strings[] = {
- "MultiTech EVB",
+ product,
"Select Mode",
"LoRa Demo",
"Configuration",