diff options
| author | Mike Fiore <mfiore@multitech.com> | 2016-10-17 10:37:42 -0500 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2016-10-17 10:37:42 -0500 |
| commit | 81cf0b046933e26fb53784e080cd0b913d83590e (patch) | |
| tree | 28436e96838b31c1db5f3fdea5351a641c79fd47 /Layout/LayoutStartup.cpp | |
| parent | a246fabb3626a82700442763097ca98493b46499 (diff) | |
| parent | 51af846aa838efac7a6bf46d001b43b5e1c446c8 (diff) | |
| download | mtdot-box-evb-factory-firmware-81cf0b046933e26fb53784e080cd0b913d83590e.tar.gz mtdot-box-evb-factory-firmware-81cf0b046933e26fb53784e080cd0b913d83590e.tar.bz2 mtdot-box-evb-factory-firmware-81cf0b046933e26fb53784e080cd0b913d83590e.zip | |
Merge branch 'releaseCandidate0' into 'master'
1. Display DOT-BOX/EVB AU915/US915/EU868 on start up and main menu screens.
2. Add check for SF_10 in demo mode. Diplay message and change to SF_9 so packet size is large enough for all data.
3. Update setup.sh to pull in libs with enable/disable irq removed for mbed 5.
See merge request !6
Diffstat (limited to 'Layout/LayoutStartup.cpp')
| -rw-r--r-- | Layout/LayoutStartup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Layout/LayoutStartup.cpp b/Layout/LayoutStartup.cpp index 4603308..bf591d5 100644 --- a/Layout/LayoutStartup.cpp +++ b/Layout/LayoutStartup.cpp @@ -24,10 +24,10 @@ LayoutStartup::LayoutStartup(DOGS102* lcd, mDot* dot) : Layout(lcd), _dot(dot), - _lName(0, 3, "MTDOT-BOX/EVB"), + _lName(0, 3, "DOT-BOX/EVB"), _lInfo(0, 4, "Factory Firmware"), _lVersion(0, 5, "Version"), - _fName(14, 3, 3), + _fName(12, 3, 5), _fVersion(8, 5, 9), _fId(0, 7, 17), _fGps(0, 6, 17), @@ -47,7 +47,7 @@ void LayoutStartup::display() { writeLabel(_lName); writeLabel(_lInfo); writeLabel(_lVersion); - writeField(_fName, mDot::FrequencyBandStr(_dot->getFrequencyBand()).substr(3)); + writeField(_fName, mDot::FrequencyBandStr(_dot->getFrequencyBand())); writeField(_fVersion, version); writeField(_fId, id); |