diff options
| -rw-r--r-- | CommandTerminal/CmdDisplayConfig.cpp | 4 | ||||
| -rw-r--r-- | Layout/LayoutStartup.cpp | 7 | ||||
| -rw-r--r-- | Layout/LayoutStartup.h | 6 | ||||
| -rw-r--r-- | Mode/ModeConfig.cpp | 1 | ||||
| -rw-r--r-- | main.cpp | 7 |
5 files changed, 18 insertions, 7 deletions
diff --git a/CommandTerminal/CmdDisplayConfig.cpp b/CommandTerminal/CmdDisplayConfig.cpp index 2f11218..edea277 100644 --- a/CommandTerminal/CmdDisplayConfig.cpp +++ b/CommandTerminal/CmdDisplayConfig.cpp @@ -1,5 +1,6 @@ #include "CmdDisplayConfig.h" #include "version.h" +#include "MTSLog.h" std::string version = MTDOT_BOX_VERSION; @@ -45,7 +46,8 @@ uint32_t CmdDisplayConfig::action(std::vector<std::string> args) { _serial.writef("Tx Data Rate:\t\t%s\r\n", mDot::DataRateStr(_dot->getTxDataRate()).c_str()); _serial.writef("Tx Power:\t\t%u\r\n", _dot->getTxPower()); - _serial.writef("Log Level:\t\t%ld\r\n", _dot->getLogLevel()); + //_serial.writef("Log Level:\t\t%ld\r\n", _dot->getLogLevel()); + _serial.writef("Log Level:\t\t%ld\r\n", mts::MTSLog::TRACE_LEVEL); _serial.writef("Maximum Size:\t\t%u\r\n", _dot->getWakeDelay()); //DotBox +MaxSize is stored here. _serial.writef("Minimum Size:\t\t%u\r\n", _dot->getWakeInterval()); //DotBox +MinSize is stored here. 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; }; diff --git a/Mode/ModeConfig.cpp b/Mode/ModeConfig.cpp index 6075897..35a81bd 100644 --- a/Mode/ModeConfig.cpp +++ b/Mode/ModeConfig.cpp @@ -24,6 +24,7 @@ ModeConfig::ModeConfig(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHand _lc(lcd), _serial(USBTX, USBRX, 512, 512) { + _serial.baud(115200); addCommand(new CmdAttention(_dot)); addCommand(new CmdIdentification(_dot, _serial)); @@ -61,7 +61,7 @@ void surveySingle(); void surveySweep(); int main() { - debug.baud(460800); + debug.baud(115200); lcd = new DOGS102(lcd_spi, lcd_spi_cs, lcd_cd); lcd_backlight = new NCP5623B(backlight_i2c); @@ -76,12 +76,11 @@ int main() { modeConfig = new ModeConfig(lcd, buttons, dot, lora); // display startup screen for 3 seconds - LayoutStartup ls(lcd); + LayoutStartup ls(lcd, dot); ls.display(); osDelay(3000); - //MTSLog::setLogLevel(MTSLog::TRACE_LEVEL); - MTSLog::setLogLevel(MTSLog::INFO_LEVEL); + MTSLog::setLogLevel(MTSLog::TRACE_LEVEL); logInfo("displaying main menu"); mainMenu(); |