From b30884816bd4af4e435c265d0e061c900e25ae88 Mon Sep 17 00:00:00 2001
From: Mike Fiore <mfiore@multitech.com>
Date: Mon, 23 Nov 2015 14:16:44 -0600
Subject: display product id on startup screen, change baud rates to 115k, set
 log level to trace

---
 Layout/LayoutStartup.cpp | 7 ++++++-
 Layout/LayoutStartup.h   | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'Layout')

diff --git a/Layout/LayoutStartup.cpp b/Layout/LayoutStartup.cpp
index 850ea50..2922035 100644
--- a/Layout/LayoutStartup.cpp
+++ b/Layout/LayoutStartup.cpp
@@ -1,13 +1,16 @@
 #include "LayoutStartup.h"
 #include "MultiTech_Logo.h"
 #include "version.h"
+#include "MTSText.h"
 
-LayoutStartup::LayoutStartup(DOGS102* lcd)
+LayoutStartup::LayoutStartup(DOGS102* lcd, mDot* dot)
   : Layout(lcd),
+    _dot(dot),
     _lName(0, 3, "MTDOT-BOX/EVB"),
     _lInfo(0, 4, "Factory Firmware"),
     _lVersion(0, 5, "Version"),
     _fVersion(8, 5, 9),
+    _fId(0, 6, 17),
     _iLogo(0, 0, MultiTech_Logo)
 {}
 
@@ -15,6 +18,7 @@ LayoutStartup::~LayoutStartup() {}
 
 void LayoutStartup::display() {
     std::string version = MTDOT_BOX_VERSION;
+    std::string id = mts::Text::bin2hexString(_dot->getDeviceId());
 
     clear();
     startUpdate();
@@ -24,6 +28,7 @@ void LayoutStartup::display() {
     writeLabel(_lInfo);
     writeLabel(_lVersion);
     writeField(_fVersion, version);
+    writeField(_fId, id);
 
     endUpdate();
 }
diff --git a/Layout/LayoutStartup.h b/Layout/LayoutStartup.h
index de8935e..c67ab1e 100644
--- a/Layout/LayoutStartup.h
+++ b/Layout/LayoutStartup.h
@@ -2,20 +2,24 @@
 #define __LAYOUTSTARTUP_H__
 
 #include "Layout.h"
+#include "mDot.h"
 
 class LayoutStartup : public Layout {
     public:
-        LayoutStartup(DOGS102* lcd);
+        LayoutStartup(DOGS102* lcd, mDot* dot);
         ~LayoutStartup();
 
         void display();
 
     private:
+        mDot* _dot;
+
         Label _lName;
         Label _lInfo;
         Label _lVersion;
 
         Field _fVersion;
+        Field _fId;
 
         Image _iLogo;
 };
-- 
cgit v1.2.3