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 /Mode/ModeDemo.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 'Mode/ModeDemo.cpp')
-rw-r--r-- | Mode/ModeDemo.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Mode/ModeDemo.cpp b/Mode/ModeDemo.cpp index f32e03c..9935b7b 100644 --- a/Mode/ModeDemo.cpp +++ b/Mode/ModeDemo.cpp @@ -41,9 +41,14 @@ bool ModeDemo::start() { _initial_data_rate = _dot->getTxDataRate(); // use configured data rate and power if possible - if ((_band == mDot::FB_US915 || _band == mDot::FB_AU915) && _initial_data_rate == mDot::DR0) { - logInfo("using DR1 instead of DR0 - DR0 max packet size is too small for data"); - _dot->setTxDataRate(mDot::DR1); + if ((_band == mDot::FB_US915 || _band == mDot::FB_AU915) && (_initial_data_rate == mDot::DR0 || _initial_data_rate == mDot::SF_10)) { + if(_initial_data_rate == mDot::DR0){ + logInfo("using DR1 instead of DR0 - DR0 max packet size is too small for data"); + _dot->setTxDataRate(mDot::DR1); + }else{ + logInfo("using SF_9 instead of SF_10 - SF_10 max packet size is too small for data"); + _dot->setTxDataRate(mDot::SF_9); + } } _state = show_help; |